Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
268,315 Commits 3 Branches 0 Tags
91173bc7e6bdd8f4c769fcbb5e73ceee62153646
Commit Graph

8913 Commits

Author SHA1 Message Date
Adrian Roos
5adaba4b21 Merge \"Merge \\\"Add MessagingStyle transitions\\\" into nyc-dev am: a5e2aa99c0 am: 0a91c8dddf\" into nyc-mr1-dev-plus-aosp 
am: 70cfa1625b

Change-Id: I4b222abebb42b89ea36fd6f273c85c860c1d22f0
 2016-06-13 22:52:58 +00:00
Makoto Onuki
eacbc45469 Merge \"Merge \\\"Push DO/PO package names from DPMS to PM\\\" into nyc-dev am: f419bd9e03 am: 93322e6818\" into nyc-mr1-dev-plus-aosp 
am: 1dc43402e9

Change-Id: I6621d43fdebb9f7b76d9c2f49a77ec626642f8da
 2016-06-13 22:52:46 +00:00
Adrian Roos
4c9e82dba4 Merge \\"Add MessagingStyle transitions\\" into nyc-dev am: a5e2aa99c0 
am: 0a91c8dddf

Change-Id: Ifd034837a0b82416e6f87dffb944b0761734a59a
 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

Change-Id: I4fd9877c9e6adcdeeb17a9a5a2e70731f6e0b596
 2016-06-13 22:30:20 +00:00
Svetoslav Ganov
b01939c3b3 Merge \\\"Fix permissions update for VrListenerService on user changes.\\\" into nyc-dev am: d054f4f2fe am: 3224aa7505 
am: 3505a88472

Change-Id: I548365e861a938fad3b8d28ca2d6f0f6a8b1f367
 2016-06-13 22:28:12 +00:00
Ruben Brunk
3505a88472 Merge \\"Fix permissions update for VrListenerService on user changes.\\" into nyc-dev am: d054f4f2fe 
am: 3224aa7505

Change-Id: I2e189f09f28a3b64c37da44caeb96af095cc1709
 2016-06-13 22:21:04 +00: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
3224aa7505 Merge \"Fix permissions update for VrListenerService on user changes.\" into nyc-dev 
am: d054f4f2fe

Change-Id: Ib69afe57e65ea7564be3bd97124ac950862d71cb
 2016-06-13 20:03:40 +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
1e8530e8e0 Merge \\\"Fix more of issue #28689719: Runtime restart\\\" into nyc-dev am: 4781525399 am: 6d8e471072 
am: 773a45272b

Change-Id: Icddc7a2bb4baedbe40f041c6c5bc5e996d46c69b
 2016-06-10 00:01:41 +00:00
Christopher Tate
e6cd26a01b Merge \\\"Turn down factory-default lock wallpaper support\\\" into nyc-dev am: 52e323bd38 am: 4676cc96ac 
am: 3b2e584686

Change-Id: I226a6d514f2e984441d600b523e7852ef6958697
 2016-06-10 00:01:26 +00:00
Dianne Hackborn
773a45272b Merge \\"Fix more of issue #28689719: Runtime restart\\" into nyc-dev am: 4781525399 
am: 6d8e471072

Change-Id: I30ca001929011e28a4b5e3e97d313bcced22b47e
 2016-06-09 22:26:49 +00:00
Dianne Hackborn
a2cb7a0ef3 Merge \"Fix more of issue #28689719: Runtime restart\" into nyc-dev 
am: 4781525399

Change-Id: I03d781408ef7b0c7c6156d6b63ca0ab4ee457ae1
 2016-06-09 22:22:48 +00: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
Chris Tate
3b2e584686 Merge \\"Turn down factory-default lock wallpaper support\\" into nyc-dev am: 52e323bd38 
am: 4676cc96ac

Change-Id: I14d78f7d229c3691c11462c0e293219603f1ef2e
 2016-06-09 22:16:39 +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
f252ef9ec1 Merge \"Turn down factory-default lock wallpaper support\" into nyc-dev 
am: 52e323bd38

Change-Id: I71646e6fb8a6996c17a9d2760aca88d6927d33ec
 2016-06-09 22:13:43 +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
255b8d089a Merge \"Merge \\\"ResourcesManager: Apply ContextThemeWrapper config\\\" into nyc-dev am: 9e9c78f8ce am: 4b9a4a18f9\" into nyc-mr1-dev-plus-aosp 
am: 47883d1b27

Change-Id: I8a9e2ba814469809d3cd6184bb757dfd6d64fe9c
 2016-06-09 21:40:27 +00:00
Adam Lesinski
7cdd96ec10 Merge \\"ResourcesManager: Apply ContextThemeWrapper config\\" into nyc-dev am: 9e9c78f8ce 
am: 4b9a4a18f9

Change-Id: Ibac064cbafdfffb0078e32027e789be98e9e1358
 2016-06-09 21:28: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
Adam Lesinski
4b9a4a18f9 Merge \"ResourcesManager: Apply ContextThemeWrapper config\" into nyc-dev 
am: 9e9c78f8ce

Change-Id: I71250c58f237135d156c64bdc08caafbe5b4a59e
 2016-06-09 21:22:34 +00:00
TreeHugger Robot
9e9c78f8ce Merge "ResourcesManager: Apply ContextThemeWrapper config" into nyc-dev 2016-06-09 21:16:03 +00:00
Adam Powell
9c02930ea0 Merge \\\"Make Activity.getReferrer tolerate custom Parcelables in intents\\\" into nyc-dev am: 7a37f8945f am: 64e3a6d760 
am: 948b94ff2f

Change-Id: I941cabb11f6221eb8cb00487058145e6e83d4330
 2016-06-09 21:15:40 +00:00
Adam Powell
948b94ff2f Merge \\"Make Activity.getReferrer tolerate custom Parcelables in intents\\" into nyc-dev am: 7a37f8945f 
am: 64e3a6d760

Change-Id: I7167b5f8112fff8c1e47c2cc954742f1f368d01c
 2016-06-09 21:08:50 +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
Adam Powell
64e3a6d760 Merge \"Make Activity.getReferrer tolerate custom Parcelables in intents\" into nyc-dev 
am: 7a37f8945f

Change-Id: I8e14173836f153d75b9c9f29f3493335af5f2763
 2016-06-09 21:05:05 +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
06fa572a53 Merge \\"Don\\'t depend directly on AppplicationInfo\\" into nyc-dev am: 55cf361d83 
am: 303bb79bef

Change-Id: I1ef92a21e310a92310af1127de32945b8ba3e82d
 2016-06-09 06:31:01 +00: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
Chad Brubaker
71cab503e3 Merge \"Don\'t depend directly on AppplicationInfo\" into nyc-dev 
am: 55cf361d83

Change-Id: Idb332dd0b729b5394ff06ae611349b674b2e7f2c
 2016-06-09 06:27:53 +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
cf22b8333a Merge \\\"Throw proper exception in ResourcesManager\\\" into nyc-dev am: 0d25fdd4a8 am: 30b5e95cbb 
am: 07c88bd4f1

Change-Id: Ia5b63c5ed4fc9b38ee64ca5aadf7ebe365bc8678
 2016-06-09 04:02:56 +00:00
Adam Lesinski
07c88bd4f1 Merge \\"Throw proper exception in ResourcesManager\\" into nyc-dev am: 0d25fdd4a8 
am: 30b5e95cbb

Change-Id: I0c8477d2eda299cb9a773860e3ce24a88e1011f1
 2016-06-09 03:56:14 +00:00
Adam Lesinski
a24ef02c6b Merge \"Throw proper exception in ResourcesManager\" into nyc-dev 
am: 0d25fdd4a8

Change-Id: I156c373b858e99b892c66f941005409097937714
 2016-06-09 03:53:56 +00: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
George Mount
1bcd351a9f Merge \\"Fix NPE in startup wizard caused by former change.\\" into nyc-mr1-dev am: 3c35716655 
am: 1d33feb8bb

Change-Id: I1653294849928e5667596c1d80ce29caecdf7c2f
 2016-06-08 23:01:54 +00:00
George Mount
1d33feb8bb Merge \"Fix NPE in startup wizard caused by former change.\" into nyc-mr1-dev 
am: 3c35716655

Change-Id: I8c1b64aee8c6e2b793fdc41def968113f71ed15c
 2016-06-08 22:56:56 +00:00