Commit Graph

228054 Commits

Author SHA1 Message Date
Todd Kennedy
8d9366cfe9 Remove 2nd line from failure
In an attempt to provide more detailed information to the end-user, we
caused tests to fail [they parse the output of the 'pm' command]. Remove
the 2nd line of the output that was causing the failure.

Also took the opportunity to merge changes from the Pm command to the
Cmd command.

Bug: 26131598
Change-Id: I459f9ec8978d87dd571136222f780039e426474e
2015-12-16 13:47:14 -08:00
Alan Viverette
0550f1b804 Merge "Check for null MenuHelper before setting presenter callback" 2015-12-16 18:56:08 +00:00
Winson Chung
636e71c326 Merge "Adding catch for b/26221779" 2015-12-16 18:33:47 +00:00
Derek Sollenberger
24fa70c2ac Merge "Remove onDrawSprite API as it is no longer exposed via SkCanvas" 2015-12-16 18:32:39 +00:00
Chris Craik
47a9fb3b5d Merge "Allow RT animation of new renderer" 2015-12-16 18:25:35 +00:00
Winson Chung
f4fdabf698 Adding catch for b/26221779
Change-Id: Id0cf455cd65bf5b202a6249b0b51351addb0bd17
2015-12-16 18:20:59 +00:00
Chris Craik
adfeec9456 Allow RT animation of new renderer
Change-Id: I60136dc080dc4fd853ac8c3d37fefa85da1181df
2015-12-16 10:20:41 -08:00
Andrei Stingaceanu
1e2839188f Wire call to suspend a package
Adds APIs in DevicePolicyManager and PackageManager for allowing
a device admin to suspend a package. PackageManagerService sets
or unsets a new PackageUserState 'suspended' setting. Terminal
command to suspend/unsuspend has been added via
PackageManagerShellCommand (as root).

Next steps:
* use the new 'suspended' setting for denying access to start app
(probably in ActivityStackSupervisor)
* broadcast a PACKAGE_(UN)SUSPENDED intent for launchers to pick up
* remove app from recents (go further and kill it if it is running)
* erase existing notifications for this app

Bug: 22776576
Change-Id: I718b3498f6a53cc0c6fdfb6d15031e53ddca4353
2015-12-16 18:14:14 +00:00
Jeff Sharkey
53129f1c21 Merge "Relax isUserRunning() when asking about self." 2015-12-16 17:57:17 +00:00
Geoff Mendal
ec87623afb Merge "Import translations. DO NOT MERGE" 2015-12-16 17:36:36 +00:00
Jeff Sharkey
caf9f49266 Relax isUserRunning() when asking about self.
When a caller is asking about locked state of themselves, don't
require the INTERACT_ACROSS_USERS permission.

Bug: 26178790
Change-Id: I0f02ebfed87b2e1cddc1cb044a9f04272f85483b
2015-12-16 10:22:45 -07:00
Jason Monk
15ca13865a Merge "Fix bootloops from new zen changed broadcast" 2015-12-16 17:17:13 +00:00
Jason Monk
6350674b01 Fix bootloops from new zen changed broadcast
Bug: 26226057
Change-Id: Ie1e0cbfdbb44c6eea3dafed777fe8ad49ca696a5
2015-12-16 12:07:46 -05:00
Geoff Mendal
0fe14154db Import translations. DO NOT MERGE
Change-Id: Idc2d12d6616f6b406b078a5662fe864f616d29e2
Auto-generated-cl: translation import
2015-12-16 18:03:59 +01:00
Derek Sollenberger
d2db5c10a3 Remove onDrawSprite API as it is no longer exposed via SkCanvas
Change-Id: Id6f0bb7a9b4eaad0d0442d4ab4212f6a56070c66
2015-12-16 16:58:32 +00:00
Geoff Mendal
c514744d62 Merge "Import translations. DO NOT MERGE" into cw-e-dev am: d0dd157ade -s ours am: 4893042569 -s ours am: 1d81716044 -s ours
am: 079a994976  -s ours

* commit '079a9949765dad88c901f3c7ab0deaa3abba0925':
  Import translations. DO NOT MERGE
2015-12-16 16:45:52 +00:00
Geoff Mendal
1a33034e81 Merge "Import translations. DO NOT MERGE" into cw-e-dev am: 8b4b230174 -s ours am: 82ce2a6cdb -s ours am: 86c9eb83ce -s ours
am: edb3565ba9  -s ours

* commit 'edb3565ba93e4990249327b8def457db50e5207e':
  Import translations. DO NOT MERGE
2015-12-16 16:43:58 +00:00
Geoff Mendal
3893beb04f Merge "Import translations. DO NOT MERGE" into cw-e-dev am: 10bc1c7000 -s ours am: c8ddc96f01 -s ours am: 5b1b0a8224 -s ours
am: 00c44332d9  -s ours

* commit '00c44332d91b375892d5521c41f4da050775b212':
  Import translations. DO NOT MERGE
2015-12-16 16:42:28 +00:00
Geoff Mendal
527f98332c Merge "Import translations. DO NOT MERGE" into cw-e-dev am: df5dd062a0 -s ours am: a32b362f00 -s ours am: 4cab51620b -s ours
am: ae767ad74a  -s ours

* commit 'ae767ad74a254cf51d6d297e5f81c82f4801e738':
  Import translations. DO NOT MERGE
2015-12-16 16:41:05 +00:00
Geoff Mendal
3c5fe2e3de Merge "Import translations. DO NOT MERGE" into cw-e-dev am: 531eb5b484 -s ours am: 57a89670cb -s ours am: b16da9aef2 -s ours
am: 67da1e8dd3  -s ours

* commit '67da1e8dd3376bd208554eba38d114485cab402d':
  Import translations. DO NOT MERGE
2015-12-16 16:39:44 +00:00
Geoff Mendal
fc0b1d326b Merge "Import translations. DO NOT MERGE" into cw-e-dev am: 327d917865 -s ours am: 7babe8de9e -s ours am: 0750798334 -s ours
am: 3b290555ef  -s ours

* commit '3b290555ef9d92949a0e5339c2d9cb7ea3e82b35':
  Import translations. DO NOT MERGE
2015-12-16 16:38:24 +00:00
Geoff Mendal
d705e71645 Import translations. DO NOT MERGE am: 22dea4e16f -s ours am: d8004c03d2 -s ours am: b295f8112c -s ours
am: 8cd03afa2b  -s ours

* commit '8cd03afa2bc9725f67922ac0f19059cbd841dcba':
  Import translations. DO NOT MERGE
2015-12-16 16:37:03 +00:00
Jeff Sharkey
96e2035223 Merge "Roll back some broadcasts." 2015-12-16 16:25:11 +00:00
Jeff Sharkey
a050e127bb Roll back some broadcasts.
Bug: 26219971, 26219772
Change-Id: Ic45691419f8fcd1b472a380f09408caf29d3c13d
2015-12-16 09:23:58 -07:00
Matt Sarett
9385625007 Merge changes from topic 'BitmapFactory'
* changes:
  Allow SkAndroidCodec to compute the decode color type and alpha type
  Modify BitmapFactory to use SkAndroidCodec
  Make NinePatchPeeker inherit from SkPngChunkReader
2015-12-16 16:05:42 +00:00
Wale Ogunwale
2336f716c8 Merge "Only persist task bounds for freeform tasks." 2015-12-16 15:32:27 +00:00
Winson Chung
0142299a99 Merge changes I32cbc333,I34926215
* changes:
  Fixing long compare.
  Cancelling window transition when starting focus animation.
2015-12-16 15:15:57 +00:00
Alan Viverette
9084d22cb9 Check for null MenuHelper before setting presenter callback
Bug: 26219569
Change-Id: Ia19a1304aa10dac52b89d0ee85acdb5671a15777
2015-12-16 09:56:37 -05:00
Geoff Mendal
8322ed39a7 Merge "Import translations. DO NOT MERGE" 2015-12-16 14:46:23 +00:00
Geoff Mendal
e72334911b Merge "Import translations. DO NOT MERGE" 2015-12-16 14:42:42 +00:00
Geoff Mendal
359395d27b Merge "Import translations. DO NOT MERGE" 2015-12-16 14:38:30 +00:00
Geoff Mendal
119741d13e Merge "Import translations. DO NOT MERGE" 2015-12-16 14:37:24 +00:00
Geoff Mendal
7beb1cf7cd Merge "Import translations. DO NOT MERGE" 2015-12-16 14:25:52 +00:00
Geoff Mendal
29e78f1169 Merge "Import translations. DO NOT MERGE" 2015-12-16 14:24:38 +00:00
Geoff Mendal
34f10d9686 Merge "Import translations. DO NOT MERGE" 2015-12-16 14:22:22 +00:00
Geoff Mendal
5f7eefc8d0 Import translations. DO NOT MERGE
Change-Id: I8dc68f5b6e8579613e61c5a060a9d2fff5729cef
Auto-generated-cl: translation import
2015-12-16 06:08:30 -08:00
Geoff Mendal
df68dfdd53 Import translations. DO NOT MERGE
Change-Id: I5470c5cea8ef18eed3baf21e7742d384e50bfed8
Auto-generated-cl: translation import
2015-12-16 06:06:08 -08:00
Geoff Mendal
6d27bf3724 Import translations. DO NOT MERGE
Change-Id: I8a5e7004c7370fe174d1af2a49b365bdd35c03f9
Auto-generated-cl: translation import
2015-12-16 06:03:13 -08:00
Geoff Mendal
caf200f88c Import translations. DO NOT MERGE
Change-Id: Idf26135155e3dc2873aa5f4de0f67fb56b8a971f
Auto-generated-cl: translation import
2015-12-16 06:02:07 -08:00
Geoff Mendal
421ff544cd Merge "Import translations. DO NOT MERGE" 2015-12-16 13:54:23 +00:00
Geoff Mendal
b6212537de Merge "Import translations. DO NOT MERGE" 2015-12-16 13:51:35 +00:00
Geoff Mendal
6839593db5 Import translations. DO NOT MERGE
Change-Id: I310f81e9ec34340edf42d9f5c0c6161b75b861a8
Auto-generated-cl: translation import
2015-12-16 05:51:29 -08:00
Geoff Mendal
6f3143de02 Import translations. DO NOT MERGE
Change-Id: Ife17cc8816a60ab0966694d1e4212b70f2340ec7
Auto-generated-cl: translation import
2015-12-16 05:48:19 -08:00
Geoff Mendal
b8224b3526 Merge "Import translations. DO NOT MERGE" 2015-12-16 13:47:37 +00:00
Geoff Mendal
71dc9e649e Import translations. DO NOT MERGE
Change-Id: Id4a6dcb82bd702595378f563a79fd4088faa6b73
Auto-generated-cl: translation import
2015-12-16 05:45:15 -08:00
Geoff Mendal
50b4bd959e Merge "Import translations. DO NOT MERGE" 2015-12-16 13:45:09 +00:00
Geoff Mendal
c481d9846f Merge "Import translations. DO NOT MERGE" 2015-12-16 13:37:47 +00:00
Geoff Mendal
3d96fac421 Import translations. DO NOT MERGE
Change-Id: I8e196e353460b6f05dbe69500c6373224857736f
Auto-generated-cl: translation import
2015-12-16 05:37:22 -08:00
Geoff Mendal
425160ef55 Merge "Import translations. DO NOT MERGE" 2015-12-16 13:35:04 +00:00
Geoff Mendal
d6a70de3ae Import translations. DO NOT MERGE
Change-Id: I5bc6d48d53fb7c0971c2a84e1c20639a2449026c
Auto-generated-cl: translation import
2015-12-16 05:34:05 -08:00