Commit Graph

246497 Commits

Author SHA1 Message Date
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
Jason Monk
e19cc141c3 QS: Protect against crash with no icon
Change-Id: I65d594c9bf15190418d96cc6d2c426df00fed212
Fixes: 28941131
2016-06-01 10:25:01 -04:00
Chris Banes
b4acd653e6 Fix action mode animation on recreations - framework edition
am: e65b3fbb63

* commit 'e65b3fbb63b4b6937fede2e4b889c0a51a881358':
  Fix action mode animation on recreations - framework edition

Change-Id: I19274b7ede1fae09deb915807c35a478caf939ee
2016-06-01 13:53:58 +00:00
Chris Banes
e65b3fbb63 Fix action mode animation on recreations - framework edition
Currently if an action mode is started in onCreate()
it will fade in. This isn't ideal though, especially
since Activities are recreated routinely with
multi-window and resizable Activities. In that instance
we fade it in on every recreate.

This CL fixes this in both the decor and toolbar action
modes to only fade in if the decor has been laid out.

BUG: 29036694

Change-Id: Iae985efcced170a0a4229124c1c132355c2aa71e
2016-06-01 14:38:17 +01:00
Bill Yi
069a939ffd Import translations. DO NOT MERGE
Change-Id: I1e9a73431f13e4ccab446571ec51524eb5a3a165
Auto-generated-cl: translation import
2016-06-01 06:15:34 -07:00
Bill Yi
2f263ac711 Import translations. DO NOT MERGE
Change-Id: Ia172193f8f33ba21461ea85c092248433d254780
Auto-generated-cl: translation import
2016-06-01 06:09:15 -07:00
Bill Yi
4db6778075 Import translations. DO NOT MERGE
Change-Id: I825eb779a66d54e72adca353cc52fbdeaf2921ae
Auto-generated-cl: translation import
2016-06-01 02:01:08 -07:00
Bill Yi
3fb5d5249d Import translations. DO NOT MERGE
Change-Id: I95a9ffff8b53c291bd9eb314641b310c4ca1cbad
Auto-generated-cl: translation import
2016-06-01 01:51:04 -07:00
Bill Yi
1648593a2a Import translations. DO NOT MERGE
Change-Id: I637f5ffcfb514015ac00e23b2a8e0c592c2958a4
Auto-generated-cl: translation import
2016-06-01 01:38:57 -07:00
Bill Yi
88b23ba405 Import translations. DO NOT MERGE
Change-Id: Ib90c671ec93583cc219bfc9bb18f199c71963f04
Auto-generated-cl: translation import
2016-06-01 01:19:56 -07:00
Erik Wolsheimer
59f05690e2 Show crash/ANR dialogs on userdebug watch builds
BUG: 28960987
Change-Id: Iaa237df9578816b91638d0bef0e0730721d62ba2
2016-05-31 21:26:36 -07:00
Wei Wang
2ab4ac3835 Merge "Trigger power hints for activity launch" into nyc-mr1-dev 2016-06-01 03:06:38 +00:00
Kevin Hufnagle
d5368b8185 cherry-pick: docs: Added note that <application> at end of manifest.
After cherry picking, removed trailing whitespace at end of lines.

Bug: 28823898
Change-Id: I30d69f1877d772893965e1512455f3addb397c80
Original-Change-Id: I9d4e67c30a0e95e78a596c933c9b9d4804eb4d6a
2016-05-31 19:41:52 -07: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
Wei Wang
98f03f98ac Trigger power hints for activity launch
BUG: 28220567
Change-Id: Id2a0397efd1dd02ee50d5626edaed9e60ea6de8a
2016-05-31 18:34:01 -07: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
Dianne Hackborn
e9a988caca Work on issue #28942589: Tune job scheduler
We now have a new settings key that provides all of the existing
tuning parameters, plus some newly redone ones for dealing with
different memory levels.

Changed the minimum batching for overall jobs from 2 to 1, so
we will never get in the way of immediately scheduling jobs
when the developer asks for this.  We should now be able to rely
on the doze modes to do better batching of jobs for us when it
is really important.

Also work on issue #28981330: Excessive JobScheduler wakeup alarms.
Use a work source with scheduled alarms to blame them on the app
whose job they are being scheduled for, and add a check for whether
a job's timing constraint has been satisfied before considering it
a possible candidate for the next alarm.  (If it is satisified,
the time is in the past, so we should not schedule an alarm for it.)

Finally clean up a bunch of the dumpsys output to make it easier
to understand.

Change-Id: I06cf2c1310448f47cf386f393e9b267335fabaeb
2016-05-31 18:16:19 -07:00
Andrii Kulian
88be465ce5 Merge "Update override config to include some changes from global config" into nyc-dev 2016-06-01 01:08:37 +00:00
Lajos Molnar
c4da6b9962 Merge "media: avoid recursion when evaluating profile support" into nyc-dev
am: a72a83a172

* commit 'a72a83a1724d1a2b047fdbb8ab343db6b9b4b7ae':
  media: avoid recursion when evaluating profile support

Change-Id: I2ba4a9e16b1989cb05291f9db2412c61bf3e2d07
2016-06-01 01:05:47 +00:00
TreeHugger Robot
a72a83a172 Merge "media: avoid recursion when evaluating profile support" into nyc-dev 2016-06-01 00:58:29 +00:00
Felipe Leme
05515ae925 Move DownloadsManager to permanent whitelist.
DownloadProvider is now based completely on JobScheduler, and deep
inside the platform we allow foreground
downloads (FLAG_WILL_BE_FOREGROUND) to run even while the device is in
doze, so it doesn't need to be temporarily whitelisted anymore.

BUG: 29056149
Change-Id: I3658bb42aeeee5d5528f91ec990d6e1bc54257b6
2016-05-31 17:50:39 -07:00
Hall Liu
561df62a52 Merge "Add null check in showLockTaskToast" into nyc-dev
am: d7007923c5

* commit 'd7007923c55994d64514706b212fa3e8c1a3b25f':
  Add null check in showLockTaskToast

Change-Id: Ieba238cbc0cc0ae36ec6cab942cbe98e55600fcb
2016-06-01 00:33:39 +00:00
Hall Liu
d7007923c5 Merge "Add null check in showLockTaskToast" into nyc-dev 2016-06-01 00:25:05 +00:00
sergeyv
c4d91f0bbf Merge "HWUI: do nothing in case of empty layer" into nyc-dev
am: 21a608f27f

* commit '21a608f27f1f7b9c0fcfbb982f290fed29cc1817':
  HWUI: do nothing in case of empty layer

Change-Id: Iec199a2a20c9981922468c3a33065a86f818d833
2016-06-01 00:20:56 +00:00
Sergei Vasilinetc
21a608f27f Merge "HWUI: do nothing in case of empty layer" into nyc-dev 2016-06-01 00:15:32 +00:00
Lajos Molnar
87436bb67f media: avoid recursion when evaluating profile support
Bug: 28671284
Bug: 29041205
Change-Id: Ia9b3596a122bd5ba554a4b4ede875ebcadc67b67
2016-05-31 16:41:27 -07:00
Philip P. Moltmann
63498afff8 Move Xerox recommendation plugin to service.
Only minimal changes just to make it work together with the other
plugins.

Bug: 28908572
Change-Id: Icac226b45e8a6885036466451d0e9f54a3b3c640
(cherry picked from commit d97fdfd943)
2016-05-31 23:35:17 +00:00
Jorim Jaggi
cc64dfcf66 Don't crash activity manager when supplying invalid URI
Change-Id: I30a058f14d5d0a09ba86fdd10312a51db7a4a9df
Fixes: 29039290
2016-05-31 23:21:30 +00:00
Christopher Tate
7d45e0231e Merge "Don\'t bother with WeakHashMap for direct alarm bookkeeping" into nyc-dev
am: cd0aa9cda8

* commit 'cd0aa9cda8e57c224b473198a345fb008fe30b5a':
  Don't bother with WeakHashMap for direct alarm bookkeeping

Change-Id: I3b28a8c03cee7fe6f85540f1f679de10de09923c
2016-05-31 23:13:20 +00:00
Alex Klyubin
29045203f3 Use correct cert chain from PKCS#7 SignedData block.
This fixes a bug where APK JAR signature verifier returned the wrong
certificate chain. Rather than returning the cert chain of the
verified SignerInfo, it was returning the bag of certs of the PKCS#7
SignedData block.

This issue was introduced in Android N and thus does not affect
earlier Android platform versions.

Bug: 29055836
Change-Id: I684c0f8e9ff47b922030645e07b6a114c0eb0963
2016-05-31 16:10:00 -07:00
Jorim Jaggi
b5952d22f0 Merge "Enforce background fallback to be non-translucent" into nyc-dev
am: a35724f666

* commit 'a35724f6667e80abc5e6b45e75d7000d3fb17267':
  Enforce background fallback to be non-translucent

Change-Id: If68ead500309566e66230b079f71667e0d555be0
2016-05-31 23:02:23 +00:00
Chris Tate
cd0aa9cda8 Merge "Don't bother with WeakHashMap for direct alarm bookkeeping" into nyc-dev 2016-05-31 22:59:26 +00:00
Hall Liu
45784f13ef Add null check in showLockTaskToast
Bug: 29056498
Change-Id: Ic4333ec4f43e3c2916a4963b5ddf9e6ad10136ed
2016-05-31 15:50:48 -07:00
Jorim Jaggi
a35724f666 Merge "Enforce background fallback to be non-translucent" into nyc-dev 2016-05-31 22:50:09 +00:00
Christopher Tate
09d7d8f674 Don't bother with WeakHashMap for direct alarm bookkeeping
Call cancel() explicitly before dropping local references to your
callback objects; they won't just quietly go away.

Bug 28987260

Change-Id: Id9da66ed86a46b4fb38127e2ddd7a7d84fd2313a
2016-05-31 15:19:47 -07:00
Steve McKay
5371f04cac Merge "Don\'t assert on uris with stack." into nyc-dev
am: 760b557158

* commit '760b5571582056e756d9fb1bc366247bc26a8e54':
  Don't assert on uris with stack.

Change-Id: I888984060b578ecff9dfefc70e6adacafe49e14c
2016-05-31 22:10:08 +00:00
TreeHugger Robot
760b557158 Merge "Don't assert on uris with stack." into nyc-dev 2016-05-31 22:03:29 +00:00
Joe Onorato
668a60bf8d Merge "Turn this wtf into just a log." into nyc-dev
am: 1755dd08cb

* commit '1755dd08cbcdd2ffb14ac2eb84edc663843ced24':
  Turn this wtf into just a log.

Change-Id: I6e4a129e2ba7ea6d23e5d3a07b120278a373ed10
2016-05-31 21:50:18 +00:00
TreeHugger Robot
1755dd08cb Merge "Turn this wtf into just a log." into nyc-dev 2016-05-31 21:42:46 +00:00
George Mount
27a0e5a632 Merge "Better handling of confused finish transition." into nyc-dev
am: 2fd9cd7cbb

* commit '2fd9cd7cbb7a792d041d0e0780b11b12b4591a90':
  Better handling of confused finish transition.

Change-Id: I27914d6161ab68ce236b9d15e5d07c71889edb4e
2016-05-31 21:37:51 +00:00
TreeHugger Robot
2fd9cd7cbb Merge "Better handling of confused finish transition." into nyc-dev 2016-05-31 21:31:31 +00:00
sergeyv
aebbbef565 HWUI: do nothing in case of empty layer
bug:28862058
Change-Id: I8e09a5c33d0eb00a829be4df706dab49cad48b1e
2016-05-31 14:18:02 -07:00
Todd Kennedy
4fb6509032 Merge "Remove STOPSHIP" into nyc-dev
am: 1c39a112b4

* commit '1c39a112b43e50da4e801d634e28ae7a130c0dcb':
  Remove STOPSHIP

Change-Id: Icc176dca4735f3b03c8e1b47015792ecc202d398
2016-05-31 21:14:37 +00:00
Todd Kennedy
1c39a112b4 Merge "Remove STOPSHIP" into nyc-dev 2016-05-31 21:07:34 +00:00
Sharvil Nanavati
7a845c5283 Merge "Clean up Bluetooth test code." into nyc-mr1-dev 2016-05-31 21:03:46 +00:00
Adrian Roos
f286ca27f4 AppError: Change "close" to "close app"
Change-Id: Ib7205e103a93c559ef2fc50921248699e9457a62
Fixes: 28813950
2016-05-31 14:02:19 -07:00
Adrian Roos
e090dcbc8a Merge "Fix crash with intent-less actions" into nyc-dev
am: ac2b44f502

* commit 'ac2b44f5021f6d863c37167b26fe7dfba9bc4c6f':
  Fix crash with intent-less actions

Change-Id: Ifa3e489a206c04b43d9747bd260156e346111d3e
2016-05-31 20:59:07 +00:00
Adrian Roos
ac2b44f502 Merge "Fix crash with intent-less actions" into nyc-dev 2016-05-31 20:51:50 +00:00
Steve McKay
3c6d499858 Don't assert on uris with stack.
This is legal arrangement when viewing Archives.
Bug: 28923366

Change-Id: I75a26edc8dac865f536a7c5bcdef1ba00b0883f0
(cherry picked from commit a379fad3b9)
2016-05-31 20:32:55 +00:00
Jorim Jaggi
0172bea180 Merge "Fix multi-window enter animation" into nyc-dev
am: 0c54d2c391

* commit '0c54d2c391b6d781fc660646e731f562bcd7037f':
  Fix multi-window enter animation

Change-Id: I85cb5a7ee1ce17e21bb52052c77352e065354734
2016-05-31 20:16:13 +00:00