Commit Graph

8346 Commits

Author SHA1 Message Date
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
TreeHugger Robot
0d25fdd4a8 Merge "Throw proper exception in ResourcesManager" into nyc-dev 2016-06-09 03:45:20 +00:00
Adam Lesinski
c82f28a913 Throw proper exception in ResourcesManager
In M we would bubble up a NameNotFoundException when failing
to load an assetmanager from another application. We switched
to throwing an IllegalArgumentException, which isn't something
anyone should handle.

This change has ResourcesManager throw Resources.NotFoundException,
which callers like ApplicationPackageManager can catch and rethrow
with the appropriate checked exception. This adds more detail to
errors than we had in M.

Bug:28876344
Change-Id: I250aeef8a4ccfd90c6abef2243edc1c5337ebde9
2016-06-08 17:25:35 -07:00
Makoto Onuki
c29f62c738 Push DO/PO package names from DPMS to PM
Bug 29126573

Change-Id: I95ea1559f6acf5d2f0e1b0953568cdfc938e83b9
2016-06-08 11:52:13 -07:00
Felipe Leme
a18a63b23a Merge \"Wrap closeQuietly() on finally block.\" into nyc-dev
am: fb5995cfbb

Change-Id: I34fbe82455b113d2608f64f9220f5a1757e39627
2016-06-08 18:16:43 +00:00
TreeHugger Robot
fb5995cfbb Merge "Wrap closeQuietly() on finally block." into nyc-dev 2016-06-08 17:59:48 +00:00
Felipe Leme
c74972f891 Wrap closeQuietly() on finally block.
BUG: 29123428
Change-Id: Ife7a919343ce4b73eef759bbc87dd37f12a71bca
2016-06-08 09:12:37 -07:00
Chong Zhang
1895addcef Merge \"Use getActivityToken() instead of mToken in isTopOfTask\" into nyc-dev
am: 723e5afa9e

Change-Id: I12f294f42e135fc181f585c515cd9ad4589ac1f2
2016-06-08 01:19:03 +00:00
Felipe Leme
9d178342d8 Merge \"Duplicate file descriptor when dumping asynchronously.\" into nyc-dev
am: c02ba17898

Change-Id: I8a483e5295a5dccf4f11f76316bf47d962fb8f12
2016-06-08 01:13:55 +00:00
Chong Zhang
723e5afa9e Merge "Use getActivityToken() instead of mToken in isTopOfTask" into nyc-dev 2016-06-08 01:12:27 +00:00
Felipe Leme
29de4922db Duplicate file descriptor when dumping asynchronously.
dumpDbInfo() uses an async task when dumping from the system thread, but
then the file descriptor is closed by the time the task is executed. As
such, the system databases are not dumped.

BUG: 29123428
Change-Id: Ibb8bbe503aa03c3ca13b2b1789f0ead0b869e9d5
2016-06-07 16:35:50 -07:00
Chong Zhang
6f9ae4ffc5 Use getActivityToken() instead of mToken in isTopOfTask
mToken could be local tokan and causes IllegalArgumentException.

bug: 29072444
Change-Id: I0f889a70a848ffea31663ed80337e1605c75223e
2016-06-03 11:50:44 -07:00
Tony Mak
fff6650de4 OP_ACTIVATE_VPN should not map to DISALLOW_CONFIG_VPN
am: 33d03a9e43

* commit '33d03a9e435eb474e3bdd3e958943e0057866477':
  OP_ACTIVATE_VPN should not map to DISALLOW_CONFIG_VPN

Change-Id: Ib8e3b7fae441adf95b928d7139455d3ca13c1fb6
2016-06-03 10:43:37 +00:00
Tony Mak
33d03a9e43 OP_ACTIVATE_VPN should not map to DISALLOW_CONFIG_VPN
They are two different things.
OP_ACTIVATE_VPN means can we allow a vpn app to establish without user
interaction while DISALLOW_CONFIG_VPN means can the user modify vpn
config.

Testing:
1. Turn on DISALLOW_CONFIG_VPN, user cannot modify vpn config through
   setting
2. Turn on DISALLOW_CONFIG_VPN, Dpm.setAlwaysOnVpn works.
3. Reboot after 2, vpn established automatically.

Bug: 29086229
Change-Id: I24899d6c7f0dd62bf441a44c6ee66fee35973a11
2016-06-03 10:06:06 +00:00
Calin Juravle
dd2fc463f1 Merge "Don\'t create or check permissions on profiles during app startup" into nyc-dev
am: e67a29a037

* commit 'e67a29a037d11d242d6afba6aff5a0feb60e289b':
  Don't create or check permissions on profiles during app startup

Change-Id: I1b8f9e4dc894d50041d06e195753116593326af0
2016-06-02 10:18:13 +00:00
Calin Juravle
e67a29a037 Merge "Don't create or check permissions on profiles during app startup" into nyc-dev 2016-06-02 10:10:36 +00:00
Jeff Sharkey
20340d0fc8 Merge "Release AssetManagers when ejecting storage." into nyc-dev
am: 380f3b12a4

* commit '380f3b12a4725a0534d62ada7c6f3bd67ebd0d01':
  Release AssetManagers when ejecting storage.

Change-Id: I92c0fcbe38dd242cb8a0a3792381de81a7c0384c
2016-06-01 23:04:09 +00:00