drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
104,396 Commits 1 Branch 0 Tags
Commit Graph

378 Commits

Author SHA1 Message Date
Amith Yamasani
0086153dbf am 36f73e25: am 9429afba: Fix a security check in getting app restrictions 
* commit '36f73e2539c08a51a165df000b9bd0a299458877':
  Fix a security check in getting app restrictions
 2013-04-10 18:50:41 -07:00
Amith Yamasani
36f73e2539 am 9429afba: Fix a security check in getting app restrictions 
* commit '9429afba06d96973ea4bf76abba945dd92a1debb':
  Fix a security check in getting app restrictions
 2013-04-10 18:47:01 -07:00
Amith Yamasani
9429afba06 Fix a security check in getting app restrictions 
Change-Id: I02fbab8765d3f8646d0fe62ee867566d1d14707d
 2013-04-10 18:40:51 -07:00
Christopher Tate
e775cee176 am 04f5c8cb: am 790518a1: Merge "Implicitly enable system apps when updates installed" into jb-mr2-dev 
* commit '04f5c8cb95f1f4f09bc0feacab36088066e58afb':
  Implicitly enable system apps when updates installed
 2013-04-10 17:08:42 -07:00
Christopher Tate
04f5c8cb95 am 790518a1: Merge "Implicitly enable system apps when updates installed" into jb-mr2-dev 
* commit '790518a1a2f06030d19fdd896bd0f80dd03d94fc':
  Implicitly enable system apps when updates installed
 2013-04-10 17:04:46 -07:00
Christopher Tate
790518a1a2 Merge "Implicitly enable system apps when updates installed" into jb-mr2-dev 2013-04-10 23:58:37 +00:00
Christopher Tate
32a019d438 Implicitly enable system apps when updates installed 
If someone explicitly installs an update to a system-bundled package,
we infer that this means they actually want to use the new code.

Bug 7467302

Change-Id: If2dc6f764bafbb3a5c94cbdd32273c030fd784b9
 2013-04-09 17:11:55 -07:00
Dianne Hackborn
875422153d resolved conflicts for merge of e9b4ee69 to master 
Change-Id: Id752ae94f63a66b2ec200f68c73bf0d7b04b249f
 2013-04-09 11:56:06 -07:00
Dianne Hackborn
e9b4ee692c am 558a3c1b: Merge "Kill processes when permissions are revoked." into jb-mr2-dev 
* commit '558a3c1b7b40eb9356f8c4446ca63af8cf16bd91':
  Kill processes when permissions are revoked.
 2013-04-09 10:42:09 -07:00
Dianne Hackborn
558a3c1b7b Merge "Kill processes when permissions are revoked." into jb-mr2-dev 2013-04-09 17:38:00 +00:00
Dianne Hackborn
f1b782427f Kill processes when permissions are revoked. 
Some permissions are associated with gids, so we need to
kill any running processes if their permission is revoked.
We will do this for any permission being revoked, since
the association between gids and permissions can change
over time.

Change-Id: Ieb7408e032539c4f21eb089d65a7a7e6c289f010
 2013-04-08 22:28:59 -07:00
Kenny Root
c21e2cb672 am b3be67ce: am 0eee410e: Merge "Check outInfo is not null" into jb-mr2-dev 
* commit 'b3be67ce34966dfccfccf4918ee5c93c4971a6d0':
  Check outInfo is not null
 2013-04-08 17:05:50 -07:00
Kenny Root
b3be67ce34 am 0eee410e: Merge "Check outInfo is not null" into jb-mr2-dev 
* commit '0eee410e473c1546af80c63ec866655a28833f33':
  Check outInfo is not null
 2013-04-08 16:16:44 -07:00
Kenny Root
3b9933d0c2 Check outInfo is not null 
Only call keystore if outInfo is not null

Bug: 8568820
Change-Id: I24ab625ad02b8510da489911064453de642b6748
 2013-04-08 16:06:24 -07:00
Geremy Condra
0bea440891 am 51ad68b9: am 212af6db: Merge "Add /data/security path for mac_permissions.xml." 
* commit '51ad68b9a5d5a8eb705eafd40833efca24731079':
  Add /data/security path for mac_permissions.xml.
 2013-04-05 16:43:29 -07:00
Geremy Condra
51ad68b9a5 am 212af6db: Merge "Add /data/security path for mac_permissions.xml." 
* commit '212af6dbd7b002bdfcc869fc0ee06d5d3d711fd6':
  Add /data/security path for mac_permissions.xml.
 2013-04-05 16:40:59 -07:00
Stephen Smalley
2c90ac6849 Add /data/security path for mac_permissions.xml. 
/data/security is now the preferred location for updated policy files.
Add it for mac_permissions.xml.
Separate change will remove the old /data/system location.

Change-Id: I2774661e84c858c9b698ec60e224bbbcdac732f3
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
 2013-04-05 13:37:27 -04:00
Ben Gruver
5e20733107 resolved conflicts for merge of 2ab72e1f to master 
Change-Id: I752332dfb1a2f15bac22d3f1a457ae1ef20cf240
 2013-04-03 17:46:19 -07:00
Ben Gruver
8c3ee9d50a Merge "Initial implementation of IntentFirewall functionality" into jb-mr2-dev 2013-04-03 23:36:22 +00:00
Nick Kralevich
997af33eb1 am 26bb9c95: am 0d17aaa5: Merge "Grant optional permissions by default for system apps." into jb-mr2-dev 
* commit '26bb9c955158893f946bed727124d3dbd3cfd0a7':
  Grant optional permissions by default for system apps.
 2013-04-03 16:33:49 -07:00
Nick Kralevich
0d17aaa543 Merge "Grant optional permissions by default for system apps." into jb-mr2-dev 2013-04-03 23:26:28 +00:00
Nick Kralevich
60792852c8 Grant optional permissions by default for system apps. 
For pre-installed system apps, automatically grant all optional
permissions.

Change-Id: I99bb320a0bbaa9873baeb63655556fe0fae6f011
 2013-04-03 16:17:06 -07:00
Kenny Root
2aeb228989 am 6812059b: am d72317ab: Remove keystore entries when package removed 
* commit '6812059b2d4aecb732ce3c94c58f2494ddc4ff6a':
  Remove keystore entries when package removed
 2013-04-03 12:40:37 -07:00
Kenny Root
d72317abd7 Remove keystore entries when package removed 
Add a hook into PackageManagerService so that when app IDs are
completely removed, we erase all entries from keystore for those UIDs
that have gone away.

(cherry picked from commit 95e3ee3971915b323e5c13dcfe3b12a4180850cd)

Bug: 3020069
Change-Id: I374258ccc103f8cb3e238f2bf0d1afda0659db94
 2013-04-03 11:32:52 -07:00
Ben Gruver
4efe9403af Initial implementation of IntentFirewall functionality 
This has the full filter functionality, but is currently only
able to block Activity intents. Logging intents, or blocking
service/broadcast intents is not yet implemented.

Change-Id: Ied3d8dedf982e17bcbdff3e328eeb87477954df7
 2013-04-02 21:18:41 -07:00
Nick Kralevich
bad8225336 am d2cc888c: am 55cfcd75: Merge "doSignaturePermission -> grantSignaturePermission" into jb-mr2-dev 
* commit 'd2cc888cb9d5dbf87146ccd8fe02ea05121c02d8':
  doSignaturePermission -> grantSignaturePermission
 2013-04-02 12:51:56 -07:00
Nick Kralevich
f486361607 am c77d3b16: am f667c8d3: Merge "grantPermissionsLPw: introduce isNewPlatformPermissionForPackage" into jb-mr2-dev 
* commit 'c77d3b16d7f1fe6cb3262eeabbc56fc3275a4f4f':
  grantPermissionsLPw: introduce isNewPlatformPermissionForPackage
 2013-04-02 12:51:53 -07:00
Nick Kralevich
2a9abe9ef3 am 0f67b255: am 5b7d1481: Merge "grantPermissionsLPw: get rid of a level of curly braces" into jb-mr2-dev 
* commit '0f67b2550c020d9d12b13018712b3165b2c47029':
  grantPermissionsLPw: get rid of a level of curly braces
 2013-04-02 12:48:05 -07:00
Nick Kralevich
cfa35cbc0c am b590b80e: am bb7ba4ae: Merge "grantPermissionsLPw: introduce doSignaturePermission" into jb-mr2-dev 
* commit 'b590b80e36fd8e54c4d48f0c17af8709cbcf174d':
  grantPermissionsLPw: introduce doSignaturePermission
 2013-04-02 12:48:03 -07:00
Nick Kralevich
55cfcd7569 Merge "doSignaturePermission -> grantSignaturePermission" into jb-mr2-dev 2013-04-02 19:44:02 +00:00
Nick Kralevich
f667c8d327 Merge "grantPermissionsLPw: introduce isNewPlatformPermissionForPackage" into jb-mr2-dev 2013-04-02 19:43:09 +00:00
Nick Kralevich
5b7d148193 Merge "grantPermissionsLPw: get rid of a level of curly braces" into jb-mr2-dev 2013-04-02 19:41:46 +00:00
Nick Kralevich
bb7ba4ae67 Merge "grantPermissionsLPw: introduce doSignaturePermission" into jb-mr2-dev 2013-04-02 19:40:23 +00:00
Dianne Hackborn
a05a368613 am 69fe4069: am 006c6338: Merge "Fix bug in initializing preferred activities." into jb-mr2-dev 
* commit '69fe40692973bf480019d71dea85d01d24eb7a68':
  Fix bug in initializing preferred activities.
 2013-04-02 12:11:54 -07:00
Kenny Root
95e3ee3971 Remove keystore entries when package removed 
Add a hook into PackageManagerService so that when app IDs are
completely removed, we erase all entries from keystore for those UIDs
that have gone away.

Bug: 3020069
Change-Id: Id4b1d51a5fa4c418865055635a84bebcf5b65ec8
 2013-04-02 11:50:16 -07:00
Nick Kralevich
94b8c93789 doSignaturePermission -> grantSignaturePermission 
Change-Id: Iee3c24c8ce5ebbd0b0e8cf7b0e308f998fc6eaf9
 2013-04-02 09:38:00 -07:00
Nick Kralevich
3337dbf707 grantPermissionsLPw: introduce isNewPlatformPermissionForPackage 
Make grantPermissionsLPw by refactoring some code into a new
function, isNewPlatformPermissionForPackage.

No functional changes.

Change-Id: I467dacfe1fcf7e77cef4cb6df54536eeaafd9064
 2013-04-02 09:38:00 -07:00
Nick Kralevich
daae541ac3 grantPermissionsLPw: get rid of a level of curly braces 
We can get rid of an indention level by modifying an if/else
block slightly.

No functional changes.

Change-Id: I0404093ea9ebe7729417d825afb6e97e158ad23e
 2013-04-02 09:38:00 -07:00
Nick Kralevich
35bee33d6f grantPermissionsLPw: introduce doSignaturePermission 
Make grantPermissionsLPw smaller by introducing a new doSignaturePermission
function.

Just a refactoring. No functional code changes.

Change-Id: Ia967fd93e3f7cf3e48fcd13be0b04994b76d36f3
 2013-04-02 09:38:00 -07:00
Dianne Hackborn
4d491a605e Fix bug in initializing preferred activities. 
Now that we are smarter about the initialization, we need
to do this after all packages are scanned.

Change-Id: I598f5ef84dcc83779bbff29e4c92136c63fb32de
 2013-04-01 18:10:51 -07:00
Amith Yamasani
8d01846130 am 5c98b904: am 9e8ba8f2: Merge "Improve RestrictionEntry API" into jb-mr2-dev 
* commit '5c98b9046506cc69b261dd6ac2ae39b2de0afacb':
  Improve RestrictionEntry API
 2013-03-29 18:52:58 -07:00
Amith Yamasani
9e8ba8f273 Merge "Improve RestrictionEntry API" into jb-mr2-dev 2013-03-30 01:47:33 +00:00
Amith Yamasani
86118baa4f Improve RestrictionEntry API 
More getters and setters, better naming.
New extra defined for returning a custom intent that handles showing the
   restrictions UI.

Change-Id: I2ee0cdb4edd99e71a9004ff5e929dbe243b45557
 2013-03-29 17:28:47 -07:00
Geremy Condra
3868a19759 am a54e0643: am 9d034deb: am 24948d3c: am 946a5c91: Merge "Save off the seinfo value with packages.list." 
* commit 'a54e064365706d40c55c2984cca1f15a6bf3e8fb':
  Save off the seinfo value with packages.list.
 2013-03-28 16:58:51 -07:00
Geremy Condra
9d034debdd am 24948d3c: am 946a5c91: Merge "Save off the seinfo value with packages.list." 
* commit '24948d3ca7ff7fa70ee85e9aa7530239d7b482b2':
  Save off the seinfo value with packages.list.
 2013-03-28 16:55:03 -07:00
Geremy Condra
946a5c91d9 Merge "Save off the seinfo value with packages.list." 2013-03-28 21:45:22 +00:00
Geremy Condra
565dd2c469 am 0314b976: am 5c3bd37a: am f21a34bf: am 2ff853da: Merge "Add data validation on seinfo labels." 
* commit '0314b976654ac9f64f8bb60962b81feadcc13d20':
  Add data validation on seinfo labels.
 2013-03-28 14:32:56 -07:00
Geremy Condra
5c3bd37ab7 am f21a34bf: am 2ff853da: Merge "Add data validation on seinfo labels." 
* commit 'f21a34bf1b188cd662f6a08f5c709f4f641b1494':
  Add data validation on seinfo labels.
 2013-03-28 14:29:17 -07:00
Geremy Condra
318a767e0d Merge "Remove keysets from PackageKeySetData when KeySetManager removes them." 2013-03-28 20:15:53 +00:00
Maggie Benthall
c78453f12b am b3c060a1: am c92342bb: Merge "Add user restrictions for bluetooth, sideloading, usb file transfer" into jb-mr2-dev 
* commit 'b3c060a166e9d5a141a6500e4c443a20d4e002b6':
  Add user restrictions for bluetooth, sideloading, usb file transfer
 2013-03-28 12:20:05 -07:00