Commit Graph

4371 Commits

Author SHA1 Message Date
Makoto Onuki
9a968df828 Merge "ShortcutManager: API rename" into nyc-mr1-dev am: 60585d12e7
am: facbcba617

* commit 'facbcba617766402b03c2b1ecc889dfc0fd9c4a2':
  ShortcutManager: API rename

Change-Id: If7da8f53354762bb7e035ab8a9c66e73886545ec
2016-06-02 00:50:25 +00:00
David Sehr
f8b6855dca Merge "Merge "Installer connection support for dump_profiles" into nyc-dev am: 7c5bcfc21a am: fc536cb862" into nyc-mr1-dev-plus-aosp
am: ad63ea9962

* commit 'ad63ea9962f300a1a660c4b565c29357460d678a':
  Installer connection support for dump_profiles

Change-Id: Ia332553255b7ca91e6d53e819a04ce90d0e669a7
2016-06-02 00:30:22 +00:00
Jeff Sharkey
0e1a527c64 Merge "Merge "Release AssetManagers when ejecting storage." into nyc-dev am: 380f3b12a4 am: 20340d0fc8" into nyc-mr1-dev-plus-aosp
am: d73289e7ac

* commit 'd73289e7ac0efe8032dbfc0a83fbb09baede7bbe':
  Release AssetManagers when ejecting storage.

Change-Id: I7e57dd56dba320694109ae66df12c700a450a6b2
2016-06-02 00:30:18 +00:00
Makoto Onuki
facbcba617 Merge "ShortcutManager: API rename" into nyc-mr1-dev
am: 60585d12e7

* commit '60585d12e717d6dd02c89cf177159dbb1c7b4fc9':
  ShortcutManager: API rename

Change-Id: Ieca236424835edf8b141706733b3bc98657547ab
2016-06-01 23:32:22 +00:00
David Sehr
4fa0e17183 Merge "Installer connection support for dump_profiles" into nyc-dev am: 7c5bcfc21a
am: fc536cb862

* commit 'fc536cb862c67d91eaa7fa94557cdc2f0f415678':
  Installer connection support for dump_profiles

Change-Id: I6f8dbd362f6accc2d90409b91e96efed531820d9
2016-06-01 23:15:53 +00:00
Jeff Sharkey
c9c4fe2af9 Merge "Release AssetManagers when ejecting storage." into nyc-dev am: 380f3b12a4
am: 20340d0fc8

* commit '20340d0fc82bccf883898e9523f3c8aca8c9ac04':
  Release AssetManagers when ejecting storage.

Change-Id: I8053660edc7088f26c94fb2a3174a743a8d60636
2016-06-01 23:15:49 +00:00
David Sehr
fc536cb862 Merge "Installer connection support for dump_profiles" into nyc-dev
am: 7c5bcfc21a

* commit '7c5bcfc21ac87c56c57b1929ce04481fa0e116c7':
  Installer connection support for dump_profiles

Change-Id: I4085587ad80b04bc99efbe51c4480f193186a872
2016-06-01 23:04:25 +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
Makoto Onuki
60585d12e7 Merge "ShortcutManager: API rename" into nyc-mr1-dev 2016-06-01 22:44:11 +00:00
David Sehr
7c5bcfc21a Merge "Installer connection support for dump_profiles" into nyc-dev 2016-06-01 22:16:05 +00:00
TreeHugger Robot
380f3b12a4 Merge "Release AssetManagers when ejecting storage." into nyc-dev 2016-06-01 22:14:57 +00:00
Benjamin Franz
042dd1cee6 Merge "Add an intent extra to force master clear" into nyc-mr1-dev am: 3c826b160c
am: 8f79bc6c77

* commit '8f79bc6c7799e2edf3bc13cb82c0972ceeb5edab':
  Add an intent extra to force master clear

Change-Id: I4af0022ec5834d2669321d5c9c76956539c8ead7
2016-06-01 21:08:13 +00:00
fionaxu
8882cf98b9 Merge "trim and strip html tags for load safe label name" into nyc-dev am: c16bc88fc9 am: 36befb2dbc
am: d97994962d

* commit 'd97994962d0d5e691d4f1df51623685c2af1341a':
  trim and strip html tags for load safe label name

Change-Id: I569bea23e9b867fa84c456accb7d24fd03853970
2016-06-01 21:02:33 +00:00
Jeff Sharkey
98bf12f999 Release AssetManagers when ejecting storage.
When ejecting a storage device, the system process needs to rapidly
release any open FDs to prevent itself from being killed by vold.

This change examines all ResourceImpls cached inside the system
process and evicts any that reference the storage device being
ejected.  (ResourcesManager will gladly recreate any evicted entries
when asked again in the future.)

Also replace broken use of WeakHashMap, since we want the values to
be weak references, not the keys.

Bug: 28867548
Change-Id: Ib9cfc66497149b6d3f8d49213e9779408a331d2a
2016-06-01 14:52:27 -06:00
Benjamin Franz
8f79bc6c77 Merge "Add an intent extra to force master clear" into nyc-mr1-dev
am: 3c826b160c

* commit '3c826b160c724d38f49bb479aa13ab8cf685e2d2':
  Add an intent extra to force master clear

Change-Id: I5789ac49b040ba6b1330e9680c1a595f24e82af9
2016-06-01 17:20:43 +00:00
Benjamin Franz
3c826b160c Merge "Add an intent extra to force master clear" into nyc-mr1-dev 2016-06-01 17:13:15 +00:00
Makoto Onuki
eddbfecb8d ShortcutManager: API rename
The words "title" and "text" implies that "text" is a secondary label
that's shown with the title, but it turned out the launcher would show
only one of those depending on how much space it has.

So now we change them to "shortLabel" and "longLabel"

Note we're only changing the API surface -- in order to mimimize
the impact to the code, internally we'll keep using the old names.

- Also remove "shortcutRank" while I'm here -- it should be implied
from the order of the XML elements.

Bug 29057378

Change-Id: I3203f63b0318c7462c1c61fef43cf9755fa8c008
2016-06-01 10:09:10 -07:00
Chen Xu
d97994962d Merge "trim and strip html tags for load safe label name" into nyc-dev am: c16bc88fc9
am: 36befb2dbc

* commit '36befb2dbce9b05ce1cf26ee9aef5c268d6c7266':
  trim and strip html tags for load safe label name

Change-Id: I630902aad16a71485506628625bb3b9c09b992f6
2016-06-01 17:06:41 +00:00
fionaxu
30680c6506 Merge "trim and strip html tags for load safe label name" into nyc-dev
am: c16bc88fc9

* commit 'c16bc88fc99a6446c77d0b075f242c042bb31ded':
  trim and strip html tags for load safe label name

Change-Id: I34cebbce65db27304e6d3dcc2c6e0cbc0f005b03
2016-06-01 16:56:44 +00:00
fionaxu
36befb2dbc Merge "trim and strip html tags for load safe label name" into nyc-dev
am: c16bc88fc9

* commit 'c16bc88fc99a6446c77d0b075f242c042bb31ded':
  trim and strip html tags for load safe label name

Change-Id: Ic79f077813fcf2124fe1cbf031cb4e0770a02a51
2016-06-01 16:55:51 +00:00
Chen Xu
c16bc88fc9 Merge "trim and strip html tags for load safe label name" into nyc-dev 2016-06-01 16:47:19 +00:00
David Sehr
a877708286 Installer connection support for dump_profiles
Bug: 28748264
Change-Id: I22322b5a0716a030d9873edcc6dfd7f3ef2d3bca
2016-06-01 08:21:27 -07:00
Benjamin Franz
f9d5e6a3db Add an intent extra to force master clear
Currently, if a priv-app sends ACTION_MASTER_CLEAR, whilst
DISALLOW_FACTORY_RESET is set, the factory reset is blocked. This CL
introduces a new extra for master clear that let's the priv-app bypass
the user restriction.

Bug: 28689894
Change-Id: I4bf979a3826454e977f1abff4562f85c8d0eec4a
2016-06-01 15:45:59 +01:00
fionaxu
e630f35322 trim and strip html tags for load safe label name
Bug: 28557603
Change-Id: I30b6c1d32e97c1fb71ba83c2845c310fe3b7f579
2016-05-31 18:42:18 -07:00
Andrii Kulian
d30ac73d31 Merge "Update override config to include some changes from global config" into nyc-dev am: 88be465ce5 am: ae01e27755
am: cd99c37bc2

* commit 'cd99c37bc2b742043be79c8d4e85876a1f7a15b4':
  Update override config to include some changes from global config

Change-Id: I95b69f5e21c573aa081752c914ff1f5797ad8aad
2016-06-01 01:34:52 +00:00
Andrii Kulian
cd99c37bc2 Merge "Update override config to include some changes from global config" into nyc-dev am: 88be465ce5
am: ae01e27755

* commit 'ae01e27755107d437bc92b1f994932c860453453':
  Update override config to include some changes from global config

Change-Id: Ie6459b34e31ea7a5a7aff40b71db0157e2fe014f
2016-06-01 01:27:28 +00:00
Andrii Kulian
ae01e27755 Merge "Update override config to include some changes from global config" into nyc-dev
am: 88be465ce5

* commit '88be465ce572f84649e01744a7ec96b6346b3686':
  Update override config to include some changes from global config

Change-Id: I2b15d9856f87e66ae9eb1ab6c9b84f7ac3add2ce
2016-06-01 01:20:50 +00:00
Andrii Kulian
a0668c7442 Merge "Update override config to include some changes from global config" into nyc-dev
am: 88be465ce5

* commit '88be465ce572f84649e01744a7ec96b6346b3686':
  Update override config to include some changes from global config

Change-Id: I0f1f9f64bcd81321f44c48cd01537749ac4727ea
2016-06-01 01:20:39 +00:00
Andrii Kulian
f12fce1a3a Update override config to include some changes from global config
In override config for task we set Configuration#screenLayout field based on
initial global config + shrink to fit the area on screen given for this task.
However this field also contains information (like layout direction) that we
do not intend to override and it can be changed in global config separately.
In this case we need to update the override config with changes from global
config.

Bug: 28616488
Change-Id: I22673257621b3f9ae7933b37bd0fb9446c6042ea
2016-05-31 13:14:55 -07:00
Nicolas Geoffray
f95fb4fb17 resolve merge conflicts of 4b092e4 to master
Change-Id: I29a92ce3afe3a7b2851126a921879631e9846a40
2016-05-31 13:35:41 +01:00
Nicolas Geoffray
4b092e47ac Merge "Cleanup performDexOpt with instruction sets." into nyc-dev am: 89f4bff149
am: 0063f2c80b

* commit '0063f2c80b1d9512fd77ca71faa85737c1fd2424':
  Cleanup performDexOpt with instruction sets.

Change-Id: If15ee5ff3e58d3bf0226bea94707e228c77fbf08
2016-05-31 11:53:00 +00:00
Nicolas Geoffray
0063f2c80b Merge "Cleanup performDexOpt with instruction sets." into nyc-dev
am: 89f4bff149

* commit '89f4bff149c62baf8371118aed2c4e6ac29976c5':
  Cleanup performDexOpt with instruction sets.

Change-Id: I6293cb0c9adf562d69aac59d74edc6540e6a0693
2016-05-31 11:36:37 +00:00
Nicolas Geoffray
ff078da846 Merge "Cleanup performDexOpt with instruction sets." into nyc-dev
am: 89f4bff149

* commit '89f4bff149c62baf8371118aed2c4e6ac29976c5':
  Cleanup performDexOpt with instruction sets.

Change-Id: Id973c65cbe87f54a743bfcb89fbe7e4aea45d1c8
2016-05-31 11:36:34 +00:00
TreeHugger Robot
89f4bff149 Merge "Cleanup performDexOpt with instruction sets." into nyc-dev 2016-05-31 11:23:44 +00:00
Christopher Tate
b787a5cb6b Merge "Don\'t call .toString() on potentially null CharSequence" into nyc-dev am: b182735757 am: 8cc9f36067
am: 6d31571950

* commit '6d315719501341621d8d7f67a2b1dd70981c4d36':
  Don't call .toString() on potentially null CharSequence

Change-Id: I22099d2d55539af4ed13d4121296402b9596f631
2016-05-28 01:11:57 +00:00
Chris Tate
6d31571950 Merge "Don\'t call .toString() on potentially null CharSequence" into nyc-dev am: b182735757
am: 8cc9f36067

* commit '8cc9f360673ac971050d03b384a78cd2163454bc':
  Don't call .toString() on potentially null CharSequence

Change-Id: Ia30a5de830ceacf310e1573f55c206d40a679db7
2016-05-28 01:04:37 +00:00
Christopher Tate
7317034daf Merge "Don\'t call .toString() on potentially null CharSequence" into nyc-dev
am: b182735757

* commit 'b182735757630db7e84e577c999b9e7d8a288353':
  Don't call .toString() on potentially null CharSequence

Change-Id: I5c8253739fa06b07abd4d67b4947c6bed153d010
2016-05-28 00:57:43 +00:00
Christopher Tate
8cc9f36067 Merge "Don\'t call .toString() on potentially null CharSequence" into nyc-dev
am: b182735757

* commit 'b182735757630db7e84e577c999b9e7d8a288353':
  Don't call .toString() on potentially null CharSequence

Change-Id: I7242f7f064f6695956a9b529f38c2ece82effbcb
2016-05-28 00:57:39 +00:00
Makoto Onuki
53da7b9ee3 Merge "ShortcutManager: Implement get-drawable APIs" into nyc-mr1-dev am: 5b11a81f9f
am: 451afea589

* commit '451afea5892454be029910b18a73d27bf41ad5bd':
  ShortcutManager: Implement get-drawable APIs

Change-Id: I6f72f51bbfed601c3ab087921e8de9a64ad785ee
2016-05-28 00:26:15 +00:00
Christopher Tate
f135b271bf Don't call .toString() on potentially null CharSequence
We're building an exception message string, but by explicitly invoking
.toString() we're accidentally triggering an NPE rather than the typed
exception we want to throw.  Build the string in a way that will be
safe and sensical even if the CharSequence is null.

Bug 29009255

Change-Id: I1813260f0b36fd44506b8327f997dd20c2d6c8bf
2016-05-27 17:13:10 -07:00
Felipe Leme
6afa2e1d1d Merge "Allow apps to bypass Power Save restrictions when launched from a Notification\'s PendingIntent." into nyc-dev am: efa291a860 am: 8c8ea506d9
am: d786355405

* commit 'd786355405dfb50b1e6eb0bb8628276b9b2823c6':
  Allow apps to bypass Power Save restrictions when launched from a Notification's PendingIntent.

Change-Id: Ic8f6cbfce572c54d7124a508af12043a58d5bc66
2016-05-27 23:43:14 +00:00
Makoto Onuki
09c6612288 resolve merge conflicts of 8de7c95 to master
Change-Id: I04447215323c7582554dc5f6ae8b105308c6f623
2016-05-27 16:10:34 -07:00
Makoto Onuki
451afea589 Merge "ShortcutManager: Implement get-drawable APIs" into nyc-mr1-dev
am: 5b11a81f9f

* commit '5b11a81f9fed69b0b6e233bad4ba8636f47febf7':
  ShortcutManager: Implement get-drawable APIs

Change-Id: If0c3279fe7374382a2f7148435b009c02e7d7e88
2016-05-27 22:52:43 +00:00
Makoto Onuki
5b11a81f9f Merge "ShortcutManager: Implement get-drawable APIs" into nyc-mr1-dev 2016-05-27 22:48:33 +00:00
Felipe Leme
d786355405 Merge "Allow apps to bypass Power Save restrictions when launched from a Notification\'s PendingIntent." into nyc-dev am: efa291a860
am: 8c8ea506d9

* commit '8c8ea506d91db44de1d312612a8f63ab107af799':
  Allow apps to bypass Power Save restrictions when launched from a Notification's PendingIntent.

Change-Id: Iaffe5981b299eca5756666bd03c67a84c8e15283
2016-05-27 20:08:59 +00:00
Felipe Leme
feaa8982fc Merge "Allow apps to bypass Power Save restrictions when launched from a Notification\'s PendingIntent." into nyc-dev
am: efa291a860

* commit 'efa291a8605e91d775faf46ada349ec7f81fcdb9':
  Allow apps to bypass Power Save restrictions when launched from a Notification's PendingIntent.

Change-Id: I11bf96280ac5e143d5260cb20238da38b4e0eaa3
2016-05-27 20:04:25 +00:00
Felipe Leme
8c8ea506d9 Merge "Allow apps to bypass Power Save restrictions when launched from a Notification\'s PendingIntent." into nyc-dev
am: efa291a860

* commit 'efa291a8605e91d775faf46ada349ec7f81fcdb9':
  Allow apps to bypass Power Save restrictions when launched from a Notification's PendingIntent.

Change-Id: Ibd09b082140b66d25bd8583040761581bb20af76
2016-05-27 20:04:22 +00:00
Felipe Leme
a1b79bfd7a Allow apps to bypass Power Save restrictions when launched from a Notification's PendingIntent.
This scenario typically happens when the device is on Doze Mode and a
notification action is triggered from a Wear device.

In a nutshell, the workflow is:

- ProcessRecord has a flag telling whether a process has "whitelist
  management" privileges.
- When NotificationManager binds a new NotificationListenerService, it
  sets the BIND_ALLOW_WHITELIST_MANAGEMENT flag.
- On bind(), ActiveService asserts that only system apps can set that
  flag.
- On computeOomAdjLocked(), ActivityManagerService sets the
  ProcessRecord flag if necessary.
- Upon creating a notification, NotificationManager calls AM to mark its
  PendingIntents as coming from a notification.
- When PendingIntentRecord sends it to the target, it checks if it's
  from a notification and if so calls AM to do the temp whitelist.
- On unbind(), ActiveService removes the ProcessRecord flag if necessary.

Fixes: 28818704

Change-Id: I00d46036a2cbb73f7f733fd35bf0b743a02807a1
2016-05-27 11:45:09 -07:00
Makoto Onuki
04b9aab945 ShortcutManager: Implement get-drawable APIs
Bug 28594168

Change-Id: I750e800b59dca56877ba78baac808aff93acd19d
2016-05-27 10:49:17 -07:00
Makoto Onuki
8de7c953a1 Merge "ShortcutManager: Support manifest shortcuts" into nyc-mr1-dev
am: 05e0a9f3cf

* commit '05e0a9f3cf632e237654c13f6d223eb22ea3be89':
  ShortcutManager: Support manifest shortcuts

Change-Id: Ib0a2620e92249452130a681208424fbddfa1935b
2016-05-27 17:34:04 +00:00