6 files changed, 15 insertions, 2 deletions

diff --git a/README b/README
index 48086cca7..c685c500c 100644
--- a/README
+++ b/README
@@ -388,6 +388,7 @@ SpotComms (https://github.com/SpotComms)
         - fixed firecfg.config file
         - added novideo and disable-mnt support in all profile files
     - added Peek and silent profiles
+    - added IntelliJ IDEA and Android Studio profiles
 SYN-cook (https://github.com/SYN-cook)
         - keepass/keepassx browser fixes
         - disable-common.inc fixes
diff --git a/README.md b/README.md
index 6ee336a09..05e45d573 100644
--- a/README.md
+++ b/README.md
@@ -107,5 +107,5 @@ Use this issue to request new profiles: [#1139](https://github.com/netblue30/fir
 
 ## New profiles:
 
-curl, mplayer2, SMPlayer, Calibre, ebook-viewer, KWrite, Geary, Liferea, peek, silentarmy
+curl, mplayer2, SMPlayer, Calibre, ebook-viewer, KWrite, Geary, Liferea, peek, silentarmy, IntelliJ IDEA, Android Studio
 
diff --git a/RELNOTES b/RELNOTES
index 31de5c96d..d9f18906f 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -2,7 +2,8 @@ firejail (0.9.49) baseline; urgency=low
   * work in progress!
   * feature: per-profile disable-mnt
   * new profiles: curl, mplayer2, SMPlayer, Calibre, ebook-viewer, KWrite,
-  * new profiles: Geary, Liferea, peek, silentarmy
+  * new profiles: Geary, Liferea, peek, silentarmy, IntelliJ IDEA,
+  * new profiles: Android Studio
   * bugfixes
  -- netblue30 <netblue30@yahoo.com>  Mon, 12 Jun 2017 20:00:00 -0500
 
diff --git a/etc/disable-programs.inc b/etc/disable-programs.inc
index d7ad242bc..2a8f66be5 100644
--- a/etc/disable-programs.inc
+++ b/etc/disable-programs.inc
@@ -4,8 +4,10 @@ include /etc/firejail/disable-programs.local
 
 blacklist ${HOME}/.*coin
 blacklist ${HOME}/.8pecxstudios
+blacklist ${HOME}/.AndroidStudio*
 blacklist ${HOME}/.Atom
 blacklist ${HOME}/.FBReader
+blacklist ${HOME}/.IdeaIC*
 blacklist ${HOME}/.LuminanceHDR
 blacklist ${HOME}/.Mathematica
 blacklist ${HOME}/.Natron
@@ -16,6 +18,7 @@ blacklist ${HOME}/.Steampid
 blacklist ${HOME}/.TelegramDesktop
 blacklist ${HOME}/.VirtualBox
 blacklist ${HOME}/.Wolfram Research
+blacklist ${HOME}/.android
 blacklist ${HOME}/.arduino15
 blacklist ${HOME}/.atom
 blacklist ${HOME}/.attic
@@ -192,11 +195,13 @@ blacklist ${HOME}/.googleearth/Cache/
 blacklist ${HOME}/.googleearth/Temp/
 blacklist ${HOME}/.googleearth/myplaces.backup.kml
 blacklist ${HOME}/.googleearth/myplaces.kml
+blacklist ${HOME}/.gradle
 blacklist ${HOME}/.guayadeque
 blacklist ${HOME}/.hedgewars
 blacklist ${HOME}/.hugin
 blacklist ${HOME}/.icedove
 blacklist ${HOME}/.inkscape
+blacklist ${HOME}/.java
 blacklist ${HOME}/.jitsi
 blacklist ${HOME}/.kde4/share/apps/gwenview
 blacklist ${HOME}/.kde4/share/apps/kcookiejar
@@ -249,6 +254,7 @@ blacklist ${HOME}/.local/share/0ad
 blacklist ${HOME}/.local/share/3909/PapersPlease
 blacklist ${HOME}/.local/share/akregator
 blacklist ${HOME}/.local/share/Empathy
+noblacklist ${HOME}/.local/share/JetBrains
 blacklist ${HOME}/.local/share/Mumble
 blacklist ${HOME}/.local/share/QuiteRss
 blacklist ${HOME}/.local/share/Ricochet
@@ -338,6 +344,7 @@ blacklist ${HOME}/.sylpheed-2.0
 blacklist ${HOME}/.synfig
 blacklist ${HOME}/.tconn
 blacklist ${HOME}/.thunderbird
+blacklist ${HOME}/.tooling
 blacklist ${HOME}/.ts3client
 blacklist ${HOME}/.viking
 blacklist ${HOME}/.viking-maps
diff --git a/platform/debian/conffiles b/platform/debian/conffiles
index a5a2ca3ed..852d54c0e 100644
--- a/platform/debian/conffiles
+++ b/platform/debian/conffiles
@@ -14,6 +14,7 @@
 /etc/firejail/abrowser.profile
 /etc/firejail/akregator.profile
 /etc/firejail/amarok.profile
+/etc/firejail/android-studio.profile
 /etc/firejail/arduino.profile
 /etc/firejail/ark.profile
 /etc/firejail/atom-beta.profile
@@ -136,6 +137,7 @@
 /etc/firejail/icecat.profile
 /etc/firejail/icedove.profile
 /etc/firejail/iceweasel.profile
+/etc/firejail/idea.sh.profile
 /etc/firejail/img2txt.profile
 /etc/firejail/inkscape.profile
 /etc/firejail/inox.profile
diff --git a/src/firecfg/firecfg.config b/src/firecfg/firecfg.config
index 3d3cc91ee..025f239ba 100644
--- a/src/firecfg/firecfg.config
+++ b/src/firecfg/firecfg.config
@@ -6,6 +6,7 @@
 abrowser
 akregator
 amarok
+android-studio
 arduino
 ark
 atom
@@ -118,6 +119,7 @@ hugin
 icecat
 icedove
 iceweasel
+idea.sh
 img2txt
 inkscape
 inox