Dan Morrill
e4d9a01bfc
Phase 1 of refactoring SystemServer.
...
SystemServer is currently a monolithic class that brings up key system
services. This change is the first phase of refactoring it to be more
configurable. Specifically, it adds a set of on/off switches used to control
startup of individual services. Future plans include finer grained controls
and a more explicit and consistent startup sequence for these services.
Change-Id: I7299f5ce7d7b74a34eb56dffb788366fbc058532
2013-04-04 09:49:22 -07:00
Jeff Sharkey
fdbf07f174
am 07e8fc89: am 9059d377: Merge "Nuke heavy parts of notification before archiving." into jb-mr2-dev
...
* commit '07e8fc89b0acec9045db9f6ae3fd7730657ae850':
Nuke heavy parts of notification before archiving.
2013-04-03 23:17:34 -07:00
Jeff Sharkey
07e8fc89b0
am 9059d377: Merge "Nuke heavy parts of notification before archiving." into jb-mr2-dev
...
* commit '9059d3775ab47b08d08ec5df1be149be52007f96':
Nuke heavy parts of notification before archiving.
2013-04-03 23:13:56 -07:00
Jeff Sharkey
9059d3775a
Merge "Nuke heavy parts of notification before archiving." into jb-mr2-dev
2013-04-04 06:09:35 +00:00
Ben Gruver
6617c3c6d3
Fix issue with intent firewall merge
...
Change-Id: I936d0f68ffa9af5d4520f598eabb873f48c04132
2013-04-03 18:45:22 -07: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
2ab72e1f1a
am 8c3ee9d5: Merge "Initial implementation of IntentFirewall functionality" into jb-mr2-dev
...
* commit '8c3ee9d50aadb0140e36000b2217f2070404b07c':
Initial implementation of IntentFirewall functionality
2013-04-03 16:39:59 -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
26bb9c9551
am 0d17aaa5: Merge "Grant optional permissions by default for system apps." into jb-mr2-dev
...
* commit '0d17aaa543f393c6c792f0b0d8ec5cb38ff1f71e':
Grant optional permissions by default for system apps.
2013-04-03 16:29:53 -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
Jeff Sharkey
0c1baf9dd6
Nuke heavy parts of notification before archiving.
...
Bug: 8537938
Change-Id: I2e4eccc3bd6d57fe5cef340d9e67986d78d3be95
2013-04-03 13:08:52 -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
6812059b2d
am d72317ab: Remove keystore entries when package removed
...
* commit 'd72317abd79ddf95d48c8f35bf1070900ff55b5e':
Remove keystore entries when package removed
2013-04-03 12:35:43 -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
Craig Mautner
00633e0270
Merge "Move startActivityUncheckedLocked to Supervisor"
2013-04-03 17:59:21 +00:00
Craig Mautner
4f42c174ad
Merge "Move startActivity from ActivityStack to Supervisor"
2013-04-03 17:57:57 +00:00
Craig Mautner
3361c7dfc4
Merge "Fix potential synch problems."
2013-04-03 15:41:36 +00:00
Craig Mautner
3ee1a66c1e
Merge "Perform activityIdleInternal in correct order."
2013-04-03 05:40:08 +00:00
Craig Mautner
8be5ea3bdb
Perform activityIdleInternal in correct order.
...
Refactor of ActivityManagerService.activityIdle left
activityIdleInternalLocked called only if stopProfiling was true.
Calling it in all situations is the correct behavior.
Fixes bug 8532130.
Change-Id: Ibd7f112bab104094ff1b1f3a2fb8c03b527ec453
2013-04-02 22:37:45 -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
Craig Mautner
8849a5ecb8
Move startActivityUncheckedLocked to Supervisor
...
This method can potentially act on different stacks so bringing
it to the supervisor from a single ActivityStack makes sense.
Change-Id: Ia2df3539dce39e8f050a9ffcef4371c0f172aaee
2013-04-02 16:41:03 -07:00
Michael Wright
01f49d0944
am bfdec890: am 75e181dd: Merge "Lock when obtaining the current monitor name." into jb-mr2-dev
...
* commit 'bfdec8908525c749f379b310f1c4d4c13d6321d7':
Lock when obtaining the current monitor name.
2013-04-02 14:21:16 -07:00
Brian Colonna
c849fbcf3d
resolved conflicts for merge of 5856ee4b to master
...
Change-Id: I60ba85bc246b9cf25d467b2099535aad47f82ca7
2013-04-02 17:16:55 -04:00
Michael Wright
bfdec89085
am 75e181dd: Merge "Lock when obtaining the current monitor name." into jb-mr2-dev
...
* commit '75e181ddfec2166026a0ce553eca2a339e21b968':
Lock when obtaining the current monitor name.
2013-04-02 14:06:03 -07:00
Michael Wright
75e181ddfe
Merge "Lock when obtaining the current monitor name." into jb-mr2-dev
2013-04-02 21:01:27 +00:00
Brian Colonna
5856ee4bd6
am 1eccc0cf: Merge "FUL now restarts when flipping tablet 180 (bug 7484464)" into jb-mr2-dev
...
* commit '1eccc0cf5f7f33203091c0b475a4ad91570c85cd':
FUL now restarts when flipping tablet 180 (bug 7484464)
2013-04-02 13:26:23 -07:00
Brian Colonna
1eccc0cf5f
Merge "FUL now restarts when flipping tablet 180 (bug 7484464)" into jb-mr2-dev
2013-04-02 20:19:24 +00:00
Craig Mautner
4c6b3b1f2b
Fix wrong synch object.
...
Fixes bug 8528754.
Change-Id: Idb09805b00c13b93ba1c6c65d86be9b76a7dd235
2013-04-02 13:19:12 -07:00
Craig Mautner
6170f73ed5
Move startActivity from ActivityStack to Supervisor
...
Change-Id: I188c8e95e6f8371a016ad6fceb0bfa5de04e4abb
2013-04-02 13:16:58 -07:00
Craig Mautner
dbcb31f28c
Fix potential synch problems.
...
- Do not schedule GC until all stacks are idle.
- Call sendPendingThumbnail outside of synchronized lock.
- Remove redundant synchronized locks.
Change-Id: I56581ca12a534765132bed405fa4b340c418436f
2013-04-02 13:06:37 -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
d2cc888cb9
am 55cfcd75: Merge "doSignaturePermission -> grantSignaturePermission" into jb-mr2-dev
...
* commit '55cfcd75691581ffc4f88034711a2442db619a53':
doSignaturePermission -> grantSignaturePermission
2013-04-02 12:48:26 -07:00
Nick Kralevich
c77d3b16d7
am f667c8d3: Merge "grantPermissionsLPw: introduce isNewPlatformPermissionForPackage" into jb-mr2-dev
...
* commit 'f667c8d327a6ae236468cbcf9f7536cf6d17e578':
grantPermissionsLPw: introduce isNewPlatformPermissionForPackage
2013-04-02 12:48:23 -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
0f67b2550c
am 5b7d1481: Merge "grantPermissionsLPw: get rid of a level of curly braces" into jb-mr2-dev
...
* commit '5b7d1481936b1c41da01cbf763c09266dd13e6f1':
grantPermissionsLPw: get rid of a level of curly braces
2013-04-02 12:44:44 -07:00
Nick Kralevich
b590b80e36
am bb7ba4ae: Merge "grantPermissionsLPw: introduce doSignaturePermission" into jb-mr2-dev
...
* commit 'bb7ba4ae67e486166547865b56efbd99e51f039a':
grantPermissionsLPw: introduce doSignaturePermission
2013-04-02 12:44:40 -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
Dianne Hackborn
69fe406929
am 006c6338: Merge "Fix bug in initializing preferred activities." into jb-mr2-dev
...
* commit '006c633896e6738297e7bc96128c56b03fbf8d01':
Fix bug in initializing preferred activities.
2013-04-02 12:09:13 -07:00
Mita Yun
af210f6d27
am 4b808adc: am ed181586: Merge "Fixed a NPE in AccountManagerService" into jb-mr2-dev
...
* commit '4b808adc44b8d5f1538eff40e5b685c14154b948':
Fixed a NPE in AccountManagerService
2013-04-02 12:08:10 -07:00
Mita Yun
4b808adc44
am ed181586: Merge "Fixed a NPE in AccountManagerService" into jb-mr2-dev
...
* commit 'ed181586a7ef0229edb27ba33d087d199ec81d53':
Fixed a NPE in AccountManagerService
2013-04-02 12:05:32 -07:00
Dianne Hackborn
006c633896
Merge "Fix bug in initializing preferred activities." into jb-mr2-dev
2013-04-02 19:01:18 +00:00
Mita Yun
f4c240e68a
Fixed a NPE in AccountManagerService
...
Bug: 8518620
Change-Id: Idf9b5864896ec57c63e3987fc01c73a5c983b5e2
2013-04-02 11:32:27 -07:00