Robin Lee
df51ab6cb2
Remove @return from void API javadoc am: 6918675fa1
...
am: 964aaea69c
2016-06-20 17:49:47 +00:00
Robin Lee
964aaea69c
Remove @return from void API javadoc
...
am: 6918675fa1
2016-06-20 17:33:24 +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
4f7b337cdd
resolve merge conflicts of cffb19c to mnc-dev am: 3f9ea2d386 am: d6c1126fab am: e2c9b1af3e am: d2a4e1b39c
...
am: 1c3be1a5b1
2016-06-17 17:09:13 +00:00
Christopher Tate
6bf184819c
resolve merge conflicts of cffb19c to mnc-dev am: 3f9ea2d386 am: d6c1126fab am: e2c9b1af3e am: d2a4e1b39c am: 1c3be1a5b1
...
am: 6b24c84fa2
2016-06-17 06:50:28 +00:00
Christopher Tate
6b24c84fa2
resolve merge conflicts of cffb19c to mnc-dev am: 3f9ea2d386 am: d6c1126fab am: e2c9b1af3e am: d2a4e1b39c
...
am: 1c3be1a5b1
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
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
2016-06-17 00:24:29 +00:00
Christopher Tate
e2c9b1af3e
resolve merge conflicts of cffb19c to mnc-dev am: 3f9ea2d386
...
am: d6c1126fab
2016-06-17 00:18:48 +00:00
Christopher Tate
d6c1126fab
resolve merge conflicts of cffb19c to mnc-dev
...
am: 3f9ea2d386
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
2016-06-16 22:30:17 +00:00
Christopher Tate
cd777e95a7
Don\'t trust callers to supply app info to bindBackupAgent()
...
am: c58054f25f
2016-06-16 22:21:37 +00:00
Adam Lesinski
f4152a9c7e
Merge \\"ResourcesManager: Allow managed addition of library asset paths\\" into nyc-dev am: 464bda8a2b
...
am: c3ab1b7c0a
2016-06-15 22:57:08 +00:00
Adam Lesinski
1dda5b39d4
Merge \"ResourcesManager: Allow managed addition of library asset paths\" into nyc-dev
...
am: 464bda8a2b
2016-06-15 22:47:58 +00:00
Adam Lesinski
c3ab1b7c0a
Merge \"ResourcesManager: Allow managed addition of library asset paths\" into nyc-dev
...
am: 464bda8a2b
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
Alex Hills
c295774697
Merge \"Adds a flag to Action.WearableExtender to display actions inline on Wear\" into nyc-mr1-dev
...
am: 7816efa6af
2016-06-15 16:13:52 +00:00
Alexander Hills
7816efa6af
Merge "Adds a flag to Action.WearableExtender to display actions inline on Wear" into nyc-mr1-dev
2016-06-15 16:02:48 +00:00
Selim Cinek
b3e68016e1
Merge \\"Fixed another case where the systemUI could crashloop\\" into nyc-dev am: 02ab2f52bf
...
am: 91965ce2e9
2016-06-14 23:19:50 +00:00
Selim Cinek
91965ce2e9
Merge \"Fixed another case where the systemUI could crashloop\" into nyc-dev
...
am: 02ab2f52bf
2016-06-14 23:12:12 +00:00
Selim Cinek
24edc3934d
Merge \"Fixed another case where the systemUI could crashloop\" into nyc-dev
...
am: 02ab2f52bf
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
f381297dea
Merge \\"Fix jittery action bar during transitions\\" into nyc-dev am: 8507d98ad1
...
am: 2c50962538
2016-06-14 19:53:31 +00:00
Adrian Roos
eac63514e4
Merge \\"Make RemoteView margins density-change safe\\" into nyc-dev am: 26e864c398
...
am: 06976edc0b
2016-06-14 19:53:25 +00:00
Adrian Roos
2c50962538
Merge \"Fix jittery action bar during transitions\" into nyc-dev
...
am: 8507d98ad1
2016-06-14 19:42:03 +00:00
Adrian Roos
06976edc0b
Merge \"Make RemoteView margins density-change safe\" into nyc-dev
...
am: 26e864c398
2016-06-14 19:41:59 +00:00
Adrian Roos
746a64493b
Merge \"Fix jittery action bar during transitions\" into nyc-dev
...
am: 8507d98ad1
2016-06-14 19:41:57 +00:00
Adrian Roos
ba38cc6992
Merge \"Make RemoteView margins density-change safe\" into nyc-dev
...
am: 26e864c398
2016-06-14 19:41:54 +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
df30e75294
Merge \\"Don\\'t take the DPMS lock in DPMI.createPackageSuspendedDialogIntent\\" into nyc-dev am: 5e94a16b74
...
am: f7c91b8838
2016-06-14 18:32:35 +00:00
Makoto Onuki
f7c91b8838
Merge \"Don\'t take the DPMS lock in DPMI.createPackageSuspendedDialogIntent\" into nyc-dev
...
am: 5e94a16b74
2016-06-14 18:26:00 +00:00
Makoto Onuki
e220722bdf
Merge \"Don\'t take the DPMS lock in DPMI.createPackageSuspendedDialogIntent\" into nyc-dev
...
am: 5e94a16b74
2016-06-14 18:25:25 +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
bac9f44555
Merge \\"Fixed a bug with a legacy notification API\\" into nyc-dev am: 05e19bba37
...
am: 844d178c2e
2016-06-14 17:07:52 +00:00
Selim Cinek
1eb9ae9220
Merge \"Fixed a bug with a legacy notification API\" into nyc-dev
...
am: 05e19bba37
2016-06-14 17:02:40 +00:00
Selim Cinek
844d178c2e
Merge \"Fixed a bug with a legacy notification API\" into nyc-dev
...
am: 05e19bba37
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
4c9e82dba4
Merge \\"Add MessagingStyle transitions\\" into nyc-dev am: a5e2aa99c0
...
am: 0a91c8dddf
2016-06-13 22:33:38 +00:00
Makoto Onuki
31a5d3affa
Merge \\"Push DO/PO package names from DPMS to PM\\" into nyc-dev am: f419bd9e03
...
am: 93322e6818
2016-06-13 22:30:20 +00:00
Ruben Brunk
3505a88472
Merge \\"Fix permissions update for VrListenerService on user changes.\\" into nyc-dev am: d054f4f2fe
...
am: 3224aa7505
2016-06-13 22:21:04 +00:00
Adrian Roos
0a91c8dddf
Merge \"Add MessagingStyle transitions\" into nyc-dev
...
am: a5e2aa99c0
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
2016-06-13 22:17:10 +00:00
