Commit Graph

8365 Commits

Author SHA1 Message Date
Robin Lee
8a8a489bbf Remove @return from void API javadoc
am: 6918675fa1

Change-Id: Ie91f340ac28868a00197898b662cb809c750ec65
2016-06-20 17:30:34 +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
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
Makoto Onuki
f419bd9e03 Merge "Push DO/PO package names from DPMS to PM" into nyc-dev 2016-06-13 21:16:29 +00:00
Svetoslav Ganov
e33f613190 Fix permissions update for VrListenerService on user changes.
- Fixes a bug where we would not update the
overlay restrictions if the VR listener we are bound to
changes bug the VR enabled state doesn't.
- Also fixed a case where the notification listener access
and location permission were not granted/revoked for the
correct user. For example, if a vr activity in one user calls
a VR activity in another (possible for cross profiles) we end
up not revoking the special access for the vr service in the
first user. The notification listener setting was also updated
for the system user instead of the user for which we grant/revoke
specal access.
- Properly remove the overlay restrictions for the old user
if we transition from a vr actiivty in one user to a vr activity
in a profile of this user.

Bug: 29273985
Change-Id: Ib1de6f2f5445001ac61edca5c77ea3a066544307
2016-06-10 14:05:51 -07:00
Dianne Hackborn
6d8e471072 Merge \"Fix more of issue #28689719: Runtime restart\" into nyc-dev
am: 4781525399

Change-Id: I554724ec2a8198dba1189972dd89ae9edc787162
2016-06-09 22:22:00 +00:00
Dianne Hackborn
4781525399 Merge "Fix more of issue #28689719: Runtime restart" into nyc-dev 2016-06-09 22:16:27 +00:00
Christopher Tate
4676cc96ac Merge \"Turn down factory-default lock wallpaper support\" into nyc-dev
am: 52e323bd38

Change-Id: I53421e5b2626029b3ddb9d987c553a5d42ca3162
2016-06-09 22:13:32 +00:00
Chris Tate
52e323bd38 Merge "Turn down factory-default lock wallpaper support" into nyc-dev 2016-06-09 22:07:00 +00:00
Adam Lesinski
cdca6fe8a6 Merge \"ResourcesManager: Apply ContextThemeWrapper config\" into nyc-dev
am: 9e9c78f8ce

Change-Id: Id216a87548da2cb2fbc3d4b5dfa7511aa293ccd9
2016-06-09 21:24:09 +00:00
TreeHugger Robot
9e9c78f8ce Merge "ResourcesManager: Apply ContextThemeWrapper config" into nyc-dev 2016-06-09 21:16:03 +00:00
Adam Powell
fb310f6a2f Merge \"Make Activity.getReferrer tolerate custom Parcelables in intents\" into nyc-dev
am: 7a37f8945f

Change-Id: I7f1b3f03d9e18fbfa732f2a96242f5f5966828ea
2016-06-09 21:05:23 +00:00
Christopher Tate
36cb2a7a91 Turn down factory-default lock wallpaper support
The infrastructure is here but not yet fully plumbed, so gracefully
provide the historical behavior until the rest is in place.

Bug 29220492

Change-Id: I36feaf68099d85e4ae11a5262002ee85346703ed
2016-06-09 13:47:19 -07:00
Dianne Hackborn
41bfaf870e Fix more of issue #28689719: Runtime restart
Change-Id: I0cce1cef884cf1508f1e726ea3439a5ffee84993
2016-06-09 12:58:25 -07:00
Adam Lesinski
c1b0ebf579 ResourcesManager: Apply ContextThemeWrapper config
The ContextThemeWrapper's configuration override must also
be applied to ResourcesManager during a configuration change.

Bug:27644297
Change-Id: Ic126308b753979c18801d422a8243aa4daf45147
2016-06-09 12:57:45 -07:00
Adam Powell
d3c63a66f2 Make Activity.getReferrer tolerate custom Parcelables in intents
Referrer information is passed as an intent extra to each Activity,
therefore if that intent contains a custom parcelable unmarshaling
the intent extras will fail in a call to getReferrer. Insulate apps
from this concern and log a warning when it happens.

Bug 28972438

Change-Id: I37dbc033bfcfe816e4b58b382c012854fbed943b
2016-06-09 12:36:16 -07:00
Chad Brubaker
303bb79bef Merge \"Don\'t depend directly on AppplicationInfo\" into nyc-dev
am: 55cf361d83

Change-Id: If30e7300c84a79871dc8a0288f8402ed49e4a662
2016-06-09 06:27:57 +00:00
TreeHugger Robot
55cf361d83 Merge "Don't depend directly on AppplicationInfo" into nyc-dev 2016-06-09 06:22:20 +00:00
Chad Brubaker
c3a6c78fed Don't depend directly on AppplicationInfo
ApplicationInfo is mutable and unfortunately some apps do actually
modify the flags. Due to the lazy loading nature of the network security
config this may lead to issues. Instead cache the needed flags and
resources at application startup.

Bug: 29063413

(cherry picked from commit 276ee969be)

Change-Id: If638a716fd903b4e9dbabcbecb38bd4e26fef08c
2016-06-08 21:48:45 -07:00
Adam Lesinski
30b5e95cbb Merge \"Throw proper exception in ResourcesManager\" into nyc-dev
am: 0d25fdd4a8

Change-Id: Iac56b8b134244013730317adf2b417cef402fd09
2016-06-09 03:53:13 +00:00