Jeff Sharkey
803a316d6e
Merge \"When uninstalling, only kill the requested user.\" into nyc-dev
...
am: 060d5a0e0a
Change-Id: I25a7bffc2c5f414fe326963c028000eaa492f540
2016-06-23 18:16:45 +00:00
TreeHugger Robot
060d5a0e0a
Merge "When uninstalling, only kill the requested user." into nyc-dev
2016-06-23 18:03:27 +00:00
Jeff Sharkey
85f449eaba
When uninstalling, only kill the requested user.
...
When an app is being uninstalled for a specific user, only kill the
app under that user; leave the app running under other users.
Bug: 28875343
Change-Id: Ie60753cfd22df10a2b17d8c3732b6f19d2fe1fb9
2016-06-23 10:15:17 -06:00
Dianne Hackborn
c7ebca2a36
Merge \"Fix issue #29532165 : System Server Java Crashes in WiFi (RT Restart)\" into nyc-dev
...
am: 576e6d27bd
Change-Id: Ib4589d04fa8c157a51ccc87508969d5d93788242
2016-06-23 03:09:56 +00:00
Dianne Hackborn
576e6d27bd
Merge "Fix issue #29532165 : System Server Java Crashes in WiFi (RT Restart)" into nyc-dev
2016-06-23 03:04:26 +00:00
Dianne Hackborn
17c77536ec
Fix issue #29532165 : System Server Java Crashes in WiFi (RT Restart)
...
I really have no idea how this can be happening (we check
for a null intent before posting the args), but add another
check before dispatching to try to avoid it.
Change-Id: Ic704850c9750b6a078c49ea628189be568031086
2016-06-22 16:55:47 -07:00
Adam Lesinski
a72a6aae37
Merge \"ContextImpl: Keep DisplayAdjustments and Display in sync\" into nyc-dev
...
am: 0bf31c3fa6
Change-Id: If0da3136f1fcb17c43a5b8c22ca890b8abcfc25c
2016-06-22 19:17:43 +00:00
Adam Lesinski
0bf31c3fa6
Merge "ContextImpl: Keep DisplayAdjustments and Display in sync" into nyc-dev
2016-06-22 19:11:36 +00:00
Dianne Hackborn
56197c9e9e
Merge \"Fix issue #29545190 : JobScheduler ContentUri NOTIFY_FOR_DESCENDANTS flag...\" into nyc-dev
...
am: a62a7eef24
Change-Id: I62361e51b439e563b91e86d6886d5b46f64737b0
2016-06-22 17:18:38 +00:00
Dianne Hackborn
121e1645d1
Fix issue #29545190 : JobScheduler ContentUri NOTIFY_FOR_DESCENDANTS flag...
...
...isn't respected if previous job was scheduled with same URI
Change-Id: Ib04f6d7cf72e7efc8e84c1a759e91ba520eda139
2016-06-21 20:39:02 -07:00
Adam Lesinski
4ece3d6bb1
ContextImpl: Keep DisplayAdjustments and Display in sync
...
Make sure that when our Resources get updated, that DisplayAdjustment
and Display properly reflect the potentially new screen dimensions.
Bug:28388969
Change-Id: I340550ea094ece87abc8790dd46aaa60ab3cedd3
2016-06-21 17:55:58 -07:00
Antonio Cansado
13cf0e7d54
Merge \"Fix infinite loop when registering data usage callback.\" into nyc-dev
...
am: c20ffc2a9e
Change-Id: I477910de04ef5a9a35d795240b93c3cf56e78042
2016-06-20 22:29:49 +00:00
Antonio Cansado
c20ffc2a9e
Merge "Fix infinite loop when registering data usage callback." into nyc-dev
2016-06-20 22:23:36 +00:00
Antonio Cansado
f704837429
Fix infinite loop when registering data usage callback.
...
Trivial fix is to call the method that takes the handler as a param.
Bug: 29508547
Change-Id: I75ba30a1663be265eed56b24deda82e83fd47a43
2016-06-20 15:03:03 -07:00
Christopher Tate
abf0d56469
Merge \"Let bmgr inspect the set of whitelisted transports\" into nyc-dev
...
am: 0f101342e1
Change-Id: Ie0f51529e4cad6f3c68c49b2b1e1d0baca6222b6
2016-06-20 17:35:04 +00:00
Robin Lee
8a8a489bbf
Remove @return from void API javadoc
...
am: 6918675fa1
Change-Id: Ie91f340ac28868a00197898b662cb809c750ec65
2016-06-20 17:30:34 +00:00
Chris Tate
0f101342e1
Merge "Let bmgr inspect the set of whitelisted transports" into nyc-dev
2016-06-20 17:19:55 +00:00
Robin Lee
6918675fa1
Remove @return from void API javadoc
...
Fix: 29500429
Change-Id: Ieddf211ad881e2e48bf593dcde6d262dd5be6c5c
(cherry picked from commit b3d6b13ad5 )
2016-06-20 14:53:58 +00:00
Christopher Tate
6b24c84fa2
resolve merge conflicts of cffb19c to mnc-dev am: 3f9ea2d386 am: d6c1126fab am: e2c9b1af3e am: d2a4e1b39c
...
am: 1c3be1a5b1
Change-Id: If28cb6bef6bb51540e03aede5ade118ad61805dd
2016-06-17 00:38:13 +00:00
Christopher Tate
1c3be1a5b1
resolve merge conflicts of cffb19c to mnc-dev am: 3f9ea2d386 am: d6c1126fab am: e2c9b1af3e
...
am: d2a4e1b39c
Change-Id: I8e59a88278ba50ab7e3768031611065131ed6834
2016-06-17 00:32:26 +00:00
Christopher Tate
d2a4e1b39c
resolve merge conflicts of cffb19c to mnc-dev am: 3f9ea2d386 am: d6c1126fab
...
am: e2c9b1af3e
Change-Id: Iab52ff84be41c1d18274d1a82492b624a7456726
2016-06-17 00:24:29 +00:00
Christopher Tate
e2c9b1af3e
resolve merge conflicts of cffb19c to mnc-dev am: 3f9ea2d386
...
am: d6c1126fab
Change-Id: I0414a137b1aab218fa57f291dbf2f7a1519bd973
2016-06-17 00:18:48 +00:00
Christopher Tate
d6c1126fab
resolve merge conflicts of cffb19c to mnc-dev
...
am: 3f9ea2d386
Change-Id: Iadf90edb02bacf645896f7d074d011a2aca4b251
2016-06-17 00:15:07 +00:00
Christopher Tate
3f9ea2d386
resolve merge conflicts of cffb19c to mnc-dev
...
Change-Id: I4dba574de2678d851e3d82961a07de27d61f5940
2016-06-16 16:31:39 -07:00
Christopher Tate
cffb19c812
Don\\\'t trust callers to supply app info to bindBackupAgent() am: c58054f25f am: cd777e95a7
...
am: ec6c3f7a32
Change-Id: Idc2b6c712078493b4186edad750d8d5beab58adf
2016-06-16 22:30:17 +00:00
Christopher Tate
cd777e95a7
Don\'t trust callers to supply app info to bindBackupAgent()
...
am: c58054f25f
Change-Id: I3b0bd91c38b5f13770f09f39c2eea78b63c29d7c
2016-06-16 22:21:37 +00:00
Christopher Tate
e227ec61c2
Let bmgr inspect the set of whitelisted transports
...
Needed for compliance testing.
Bug 29072466
Change-Id: I025058ab9197f9e2db062bf0074e79f1cd04b443
2016-06-15 17:40:31 -07:00
Adam Lesinski
c3ab1b7c0a
Merge \"ResourcesManager: Allow managed addition of library asset paths\" into nyc-dev
...
am: 464bda8a2b
Change-Id: I352c56482aca030efab49ca39301679b51e44e05
2016-06-15 22:44:43 +00:00
Adam Lesinski
464bda8a2b
Merge "ResourcesManager: Allow managed addition of library asset paths" into nyc-dev
2016-06-15 22:35:26 +00:00
Adam Lesinski
25f48886b2
ResourcesManager: Allow managed addition of library asset paths
...
This allows WebView to add itself to the ResourcesManager and
remain their even after configuration changes and multi-window
changes.
Bug:29112218
Change-Id: I2cb131ae2c61fb58c48babafdd46c1882be96aa9
2016-06-15 12:00:18 -07:00
Selim Cinek
24edc3934d
Merge \"Fixed another case where the systemUI could crashloop\" into nyc-dev
...
am: 02ab2f52bf
Change-Id: If26ae07e20433213334233bea1231440fae817e1
2016-06-14 23:11:25 +00:00
Christopher Tate
c58054f25f
Don't trust callers to supply app info to bindBackupAgent()
...
Get the canonical identity and metadata about the package from the
Package Manager at time of usage rather than rely on the caller to
have gotten things right, even when the caller has the system uid.
Bug 28795098
Change-Id: I215786bc894dedf7ca28e9c80cefabd0e40ca877
2016-06-14 13:28:43 -07:00
Selim Cinek
279fa867e5
Fixed another case where the systemUI could crashloop
...
Because it's not guaranteed to use any builder at all,
there is another case where the SmallIcon could remain null.
We are now checking this lazily instead of ahead of time.
Change-Id: I7a0feff6911b2bce6707427259d3423131a26e32
Fixes: 29255365
2016-06-14 13:02:56 -07:00
Adrian Roos
2c50962538
Merge \"Fix jittery action bar during transitions\" into nyc-dev
...
am: 8507d98ad1
Change-Id: I398e98789bd7ebac32289a0a84ba9ab3393fb70e
2016-06-14 19:42:03 +00:00
Adrian Roos
06976edc0b
Merge \"Make RemoteView margins density-change safe\" into nyc-dev
...
am: 26e864c398
Change-Id: I9fb7b321751443c750ee8acb0190a79dd8669941
2016-06-14 19:41:59 +00:00
Adrian Roos
8507d98ad1
Merge "Fix jittery action bar during transitions" into nyc-dev
2016-06-14 19:31:25 +00:00
Adrian Roos
26e864c398
Merge "Make RemoteView margins density-change safe" into nyc-dev
2016-06-14 19:31:14 +00:00
Makoto Onuki
f7c91b8838
Merge \"Don\'t take the DPMS lock in DPMI.createPackageSuspendedDialogIntent\" into nyc-dev
...
am: 5e94a16b74
Change-Id: I61c3582d8b51124b33b39249f20bdfe71e764a69
2016-06-14 18:26:00 +00:00
Makoto Onuki
5e94a16b74
Merge "Don't take the DPMS lock in DPMI.createPackageSuspendedDialogIntent" into nyc-dev
2016-06-14 18:17:01 +00:00
Selim Cinek
844d178c2e
Merge \"Fixed a bug with a legacy notification API\" into nyc-dev
...
am: 05e19bba37
Change-Id: I419b48b3a4e73b5cc1c7597d885541f4b163a00f
2016-06-14 17:02:39 +00:00
Selim Cinek
05e19bba37
Merge "Fixed a bug with a legacy notification API" into nyc-dev
2016-06-14 16:54:21 +00:00
Makoto Onuki
26704957fe
Don't take the DPMS lock in DPMI.createPackageSuspendedDialogIntent
...
This method is called by AM with the lock held, so can't take the
DPMS lock.
It still takes a different lock, but we don't call into the external
world while holding this lock, so this is fine.
Bug 29242568
Change-Id: Idbecdd7d97385ca66c693903443471fdbae833e6
2016-06-14 09:41:21 -07:00
Selim Cinek
4ac6f6010b
Fixed a bug with a legacy notification API
...
When using setLatestEventInfo the icons would not be shown
at all anymore, leading to a crash if they were grouped.
This CL makes sure the smallIcon is always set even for those
legacy apps.
It also fixes the usage of setShow when, as legacy apps wouldn't
have the time anymore.
Change-Id: I2645175b2adabcedbbfec7a502b89d143d2b9bd3
Fixes: 29255365
Fixes: 27430676
2016-06-13 15:47:03 -07:00
Adrian Roos
f852a42b04
Fix jittery action bar during transitions
...
Fixes a bug where the action bar would get cut off slightly
resulting in a bad transition when transforming between action
bars that were correct and those that were cut off.
Fixes: 28935363
Change-Id: I7d8eeb5e5fa545820a8979ea09816b330bdb384b
2016-06-13 15:39:11 -07:00
Adrian Roos
2d5dbba923
Make RemoteView margins density-change safe
...
Bug: 28935363
Change-Id: I279da8da84f794c512a66cb46c76ae9e746a6387
2016-06-13 15:39:05 -07:00
Adrian Roos
0a91c8dddf
Merge \"Add MessagingStyle transitions\" into nyc-dev
...
am: a5e2aa99c0
Change-Id: I96170c3811dd624969a1f93bb7a2dc65b8d5df0a
2016-06-13 22:20:05 +00:00
Makoto Onuki
93322e6818
Merge \"Push DO/PO package names from DPMS to PM\" into nyc-dev
...
am: f419bd9e03
Change-Id: I27dec65477ddfa90060baeea26169ea79503f642
2016-06-13 22:17:10 +00:00
Svetoslav Ganov
5d411eb81a
Merge \"Fix permissions update for VrListenerService on user changes.\" into nyc-dev
...
am: d054f4f2fe
Change-Id: I9bacc14760274c9684f0535d59133dfb109bf7a0
2016-06-13 22:14:09 +00:00
Adrian Roos
a5e2aa99c0
Merge "Add MessagingStyle transitions" into nyc-dev
2016-06-13 21:45:08 +00:00
Adrian Roos
feafa052f3
Add MessagingStyle transitions
...
Fixes a particularly bad transition in the case where there
is one incoming message to a group.
Change-Id: Ieddece4a496292a69e14cdcd74d94986938d8223
Fixes: 29043489
2016-06-13 14:31:51 -07:00