Commit Graph

245370 Commits

Author SHA1 Message Date
TreeHugger Robot
648c1112a6 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-06-09 13:51:11 +00:00
Bill Yi
2d12492338 Import translations. DO NOT MERGE
Change-Id: If53965a4f42f4c97334fc88250af6a72a9658b8a
Auto-generated-cl: translation import
2016-06-09 05:39:26 -07:00
Narayan Kamath
cf70a17a71 PackageManagerService: fix NPE while renaming foreign dex markers.
The User passed in to scan*LI is null during the initial boot scan
and maybeRenameForeignDexMarkers wasn't expecting it. We attempt to
rename markers for all users if that happens.

bug: 29167406
Change-Id: I892dcc542e75d62d72c062b8ce5506ef85df5fc2
2016-06-09 08:24:11 +00:00
TreeHugger Robot
55cf361d83 Merge "Don't depend directly on AppplicationInfo" into nyc-dev 2016-06-09 06:22:20 +00:00
Bill Yi
2373132065 Import translations. DO NOT MERGE
Change-Id: I3234ff4e69fbcc40de1d78539fcc886957b5dce5
Auto-generated-cl: translation import
2016-06-08 22:27:34 -07:00
David Sehr
1c4da6654f Merge "Simplify code paths computation, allow adb root to dump" into nyc-dev 2016-06-09 05:20:20 +00:00
Svet Ganov
c69266dec6 Protect the android.intent.action.CALL_PRIVILEGED broadcast
bug:29178416

Change-Id: I5e8f1e5423d0dd59cc532a45142b2401f5e5a45b
2016-06-08 22:15:35 -07: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
TreeHugger Robot
0d25fdd4a8 Merge "Throw proper exception in ResourcesManager" into nyc-dev 2016-06-09 03:45:20 +00:00
Erik Wolsheimer
24d94b8aa0 Merge \\"DO NOT MERGE ANYWHERE Fix NPE when UID has no packages.\\" into cw-e-dev am: eae242cfe8 -s ours
am: 8b04b0db2e  -s ours

Change-Id: I459eec39aa68d4e165264189ce051bc8b4253965
2016-06-09 03:42:27 +00:00
Erik Wolsheimer
8b04b0db2e Merge \"DO NOT MERGE ANYWHERE Fix NPE when UID has no packages.\" into cw-e-dev
am: eae242cfe8  -s ours

Change-Id: Ia418392bcbab16d2c02689fdc79138b1cee304ab
2016-06-09 03:37:02 +00:00
Erik Wolsheimer
eae242cfe8 Merge "DO NOT MERGE ANYWHERE Fix NPE when UID has no packages." into cw-e-dev 2016-06-09 03:25:43 +00:00
fionaxu
9f0a266df9 DO NOT MERGE fix build breakage on k am: 4e33c4f8b1 am: 07c994012c am: 84f479f6b5 -s ours am: e1ca4cd074 -s ours am: 0e64d7411e am: eb53629bf7 am: 16dfcd7950 -s ours am: 2d03c0f956 am: dc9a7c7b23 am: e892848035
am: 7e2c6c3440  -s ours

Change-Id: Ic463b8a7a1a1ea537f1fea4fd36dd176464ac789
2016-06-09 02:39:15 +00:00
Chen Xu
0c4f1c7e5c Merge "resolve merge conflicts of afed6f8 to nyc-dev" into nyc-dev 2016-06-09 02:32:52 +00:00
Sreevani Sreejith
e8ebd8aea0 Merge \\"docs: Documented how to handle alarms in AA media apps.\\" into mnc-io-docs am: 21d6abf7be
am: 539b6b7580

Change-Id: I92cd1c4193e9e8920f28f3300d28bdc8bb6b04cd
2016-06-09 02:28:58 +00:00
sreevanis
539b6b7580 Merge \"docs: Documented how to handle alarms in AA media apps.\" into mnc-io-docs
am: 21d6abf7be

Change-Id: Id05d99983414d3884c0c90fb67eec224ca77c80b
2016-06-09 02:23:30 +00:00
Sreevani Sreejith
21d6abf7be Merge "docs: Documented how to handle alarms in AA media apps." into mnc-io-docs 2016-06-09 02:15:38 +00:00
sreevanis
c2f67456aa docs: Documented how to handle alarms in AA media apps.
Bug:27708785
Change-Id: Iee2a676fd8adbcba00301932d5e5637ee21df224
2016-06-08 19:10:49 -07:00
TreeHugger Robot
9e94c455f8 Merge "Always re-enable keyguard state when the user switches." into nyc-dev 2016-06-09 01:38:32 +00:00
TreeHugger Robot
e36da9c8c9 Merge "Revert "Temporarily increase timeout for devices with buggy driver"" into nyc-dev 2016-06-09 00:28:54 +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
fionaxu
7978147771 resolve merge conflicts of afed6f8 to nyc-dev
Bug: 28557603
Change-Id: Icb19f3d031cce2d846d5f6e9ad4d28d002db6bac
2016-06-08 17:23:09 -07:00
Winson
18227e4831 Forcing software in header button background ripples.
Bug: 29133575
Change-Id: I21125e28208335f5b2c2adf06cb1c8199b3ca476
2016-06-09 00:20:01 +00:00
TreeHugger Robot
e5417a3863 Merge "Consume the first sample of KernelUidCpuTimeReader" into nyc-dev 2016-06-08 22:49:24 +00:00
Eric Schmidt
a63e0209ee docs: Added links to performance resources section
Bug: 27925680
Change-Id: Ide169d8f1b182cb1ed0021c35f2eee51feac71d7
2016-06-08 15:37:40 -07:00
Winson
f00098805c Fixing several issues with accessibility
- Only reset the focused task if the task that we removed actually had 
  accessibility focus.
- Only reset the focused task on scroll if we are not in touch 
  exploration mode
- Ensure the focused view has accessibility focus when entering recents
  in touch exploration mode
- Instead of using the focused task, query for the accessibility focused
  task view when setting the focused task in response to the scroll 
  gesture.  In addition, use this accessibility focused task to 
  determine whether we need to add the accessibility actions
- No longer explicitly requesting accessibility focus on view focus
- Removing some unused code

Bug: 29046351
Change-Id: I5701a408bd919e47990f0d2fc6e4686eb9530d8e
2016-06-08 15:14:59 -07:00
Dan Willemsen
06b93912d5 CtsShim: Support building with tapas
This way the build server can build these apks, instead of the manual
process that was described in the README.

Bug: 29122339
Change-Id: I2d3d9924da908d501d3b1b07b4a317f8ad6f413f
2016-06-08 15:08:04 -07:00
Svetoslav Ganov
7014eef54a Merge "Teach persistable Uri grants about direct boot" into nyc-dev 2016-06-08 21:54:40 +00:00
Adam Lesinski
e7f4f0297f Consume the first sample of KernelUidCpuTimeReader
If the system_server crashes, when it starts back up
it will assume that the entries in kernelUidCpuTimeReader
are all fresh and we will end up double counting cpu time
and power.

Bug:29163081
Change-Id: I73e693199c170229af57efd610950e90263ac9bc
2016-06-08 14:19:09 -07:00
Adarsh Fernando
fe089e3dc5 AS UI redirect for experimental to stable Gradle migration guide am: c65f7e8071
am: 28f355bb63

Change-Id: I5efe04ef8a2c7c3d7a226ee91beca0f89e48be37
2016-06-08 21:18:02 +00:00
Adarsh Fernando
28f355bb63 AS UI redirect for experimental to stable Gradle migration guide
am: c65f7e8071

Change-Id: I6ebb598650756de2687b4ab73ef41e27b13c8b1c
2016-06-08 21:12:56 +00:00
Adarsh Fernando
c65f7e8071 AS UI redirect for experimental to stable Gradle migration guide
- This guide may be moved over to DAC when AS 2.2 goes stable.

Change-Id: Ia29bb75832f01efc8175db45f8fd08d5013d715e
2016-06-08 13:42:37 -07:00
Adrian Roos
3207d8f8a1 Merge "Direct Reply: Add back emoji button" into nyc-dev 2016-06-08 20:25:01 +00:00
David Sehr
ac063d64ea Simplify code paths computation, allow adb root to dump
Bug: 28748264
Change-Id: I1aefa5d98e80b58d6ed500c5d2d610569cf25c3a
2016-06-08 13:24:29 -07:00
Adrian Roos
713fed9226 Direct Reply: Add back emoji button
Bug: 29077108
Change-Id: Ibd1423465c5ec9aced4c4b77575a469f5e85f20d
2016-06-08 13:22:25 -07:00
TreeHugger Robot
b99e19c729 Merge "Ensure pinned animation scaling is consistently applied." into nyc-dev 2016-06-08 20:08:38 +00:00
Svet Ganov
f581be6ff5 Teach persistable Uri grants about direct boot
We read the persistable Uri grants on boot at which point
the user is not unlocked. This results in ignoring Uri
grants for boot unaware content providers.

This change reads all persisted Uri grants on boot but
filters them out during query based on the current user
unlock state.

bug:29058113

Change-Id: I2643fc098f42359e72a4c534236debc9b9389256
2016-06-08 12:44:20 -07:00
Selim Cinek
bbcb733d80 Merge changes I0ca13626,I3677ce54 into nyc-dev
* changes:
  Fixed a flicker when closing QS without notifications
  Handled expandability and swiping while guts are exposed
2016-06-08 19:37:40 +00:00
Jason Monk
fd6e7e6790 Merge "QS Edit: Extra extra make sure hidden when locked" into nyc-dev 2016-06-08 19:12:20 +00:00
Jason Monk
883da638e2 Merge "QS: Fix leak in QSAnimator" into nyc-dev 2016-06-08 19:12:07 +00:00
Jason Monk
fbf366d7ee Merge "QS: Show date even on small screens" into nyc-dev 2016-06-08 19:11:41 +00:00
Jason Monk
4455fc734c Merge "Fix crash when an app with an active quicksettings tile is updated to no longer have that tile." into nyc-dev 2016-06-08 19:11:16 +00:00
Will Harmon
604c2f9440 Fix crash when an app with an active quicksettings tile is updated to no longer have that tile.
Fixes: 28721139
Change-Id: Ib53c7cc08e9378420a5fed3459c1e17864b28802
2016-06-08 19:10:57 +00:00
Jason Monk
27eadb6f1d Merge "Settings: Better handling for disabled tiles" into nyc-dev 2016-06-08 19:10:10 +00: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
fionaxu
7e2c6c3440 DO NOT MERGE fix build breakage on k am: 4e33c4f8b1 am: 07c994012c am: 84f479f6b5 -s ours am: e1ca4cd074 -s ours am: 0e64d7411e am: eb53629bf7 am: 16dfcd7950 -s ours am: 2d03c0f956 am: dc9a7c7b23
am: e892848035

Change-Id: Ic74c9116d505f3f76dd659d7bfd60ded6463f0ed
2016-06-08 18:41:33 +00:00
fionaxu
e892848035 DO NOT MERGE fix build breakage on k am: 4e33c4f8b1 am: 07c994012c am: 84f479f6b5 -s ours am: e1ca4cd074 -s ours am: 0e64d7411e am: eb53629bf7 am: 16dfcd7950 -s ours am: 2d03c0f956
am: dc9a7c7b23

Change-Id: I0cccd4ba128987959aa0e9324c1f5ab5bb5bc455
2016-06-08 18:33:22 +00:00
Ian Pedowitz
afaa1e9db1 Merge "Return correct default theme on API >= 24" into nyc-dev 2016-06-08 18:28:00 +00:00
fionaxu
afed6f8631 resolve merge conflicts of 2c53526 to lmp-mr1-dev am: c196526f8e am: 1e8fe12f4e am: 965084dd0c am: 698e044717 am: c95d552de0
am: c10e4fae05

Change-Id: I8e5e9345aa8eeeae5a7af94a4cac892ee8e558ee
2016-06-08 18:24:16 +00:00
fionaxu
dc9a7c7b23 DO NOT MERGE fix build breakage on k am: 4e33c4f8b1 am: 07c994012c am: 84f479f6b5 -s ours am: e1ca4cd074 -s ours am: 0e64d7411e am: eb53629bf7 am: 16dfcd7950 -s ours
am: 2d03c0f956

Change-Id: I9dfe9f73a3762ec0eed0659a7ac04f9980e715bb
2016-06-08 18:22:46 +00:00