drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
244,596 Commits 1 Branch 0 Tags
Commit Graph

244596 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Sehr
1c4da6654f Merge "Simplify code paths computation, allow adb root to dump" into nyc-dev 2016-06-09 05:20:20 +00: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
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
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
Julia Reynolds
e1451c4e30 Merge "Handle alarm firing outside of DND period." into nyc-dev 2016-06-08 18:19:13 +00:00
fionaxu
c10e4fae05 resolve merge conflicts of 2c53526 to lmp-mr1-dev am: c196526f8e am: 1e8fe12f4e am: 965084dd0c am: 698e044717 
am: c95d552de0

Change-Id: I4db8cef9678c409b7f0610d98f161e0e048a0333
 2016-06-08 18:11:09 +00:00
TreeHugger Robot
fb5995cfbb Merge "Wrap closeQuietly() on finally block." into nyc-dev 2016-06-08 17:59:48 +00:00
Amith Yamasani
718f321369 Merge "Add a separate read permission for oem unlock state" into nyc-dev 2016-06-08 17:55:41 +00:00
Tianjie Xu
00681d0e78 Merge "Change unit of I/O statistics to MiB" into nyc-dev 2016-06-08 17:25:16 +00:00
fionaxu
2d03c0f956 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

Change-Id: Ia5003c773216218c4ed2961587fb30f4536d89a7
 2016-06-08 17:23:33 +00:00
fionaxu
c95d552de0 resolve merge conflicts of 2c53526 to lmp-mr1-dev am: c196526f8e am: 1e8fe12f4e am: 965084dd0c 
am: 698e044717

Change-Id: I5a00c0b206cae8a13f860783756ffa66c08db65d
 2016-06-08 17:23:27 +00:00
fionaxu
16dfcd7950 DO NOT MERGE fix build breakage on k am: 4e33c4f8b1 am: 07c994012c am: 84f479f6b5 -s ours am: e1ca4cd074 -s ours am: 0e64d7411e 
am: eb53629bf7

Change-Id: Ie99251c23087ebe648a3450aa2a9fe881cb3c1f8
 2016-06-08 17:15:39 +00:00
fionaxu
698e044717 resolve merge conflicts of 2c53526 to lmp-mr1-dev am: c196526f8e am: 1e8fe12f4e 
am: 965084dd0c

Change-Id: I1db27bacdfc0c66ddc28c3d656f1f5cfb98894a8
 2016-06-08 17:11:49 +00:00
fionaxu
eb53629bf7 DO NOT MERGE fix build breakage on k am: 4e33c4f8b1 am: 07c994012c am: 84f479f6b5 -s ours am: e1ca4cd074 -s ours 
am: 0e64d7411e

Change-Id: I856719a3bec69549b83507fefcd662ce54104eaf
 2016-06-08 17:10:02 +00:00
fionaxu
965084dd0c resolve merge conflicts of 2c53526 to lmp-mr1-dev am: c196526f8e 
am: 1e8fe12f4e

Change-Id: I3122c1d81dde1088990bcbd2aff7eea478ead4fc
 2016-06-08 17:04:09 +00:00