OSDN Git Service
Jason Monk [Thu, 9 Jun 2016 15:35:06 +0000 (15:35 +0000)]
Merge \"QS: Fix crash when removing pages in RTL\" into nyc-dev
am:
9b5a780722
Change-Id: I7ce2129e38e385cac2f67c8b4eba00fee2bf35eb
Xiaohui Chen [Thu, 9 Jun 2016 15:35:03 +0000 (15:35 +0000)]
Merge \"QS Detail: Fix up open/close animations\" into nyc-dev
am:
ac2e291832
Change-Id: I0378c30d344504474434bb645df3af58e768ed28
Jason Monk [Thu, 9 Jun 2016 15:25:00 +0000 (15:25 +0000)]
Merge "QS: Fix crash when removing pages in RTL" into nyc-dev
Jason Monk [Thu, 9 Jun 2016 15:22:48 +0000 (15:22 +0000)]
Merge "QS Detail: Fix up open/close animations" into nyc-dev
TreeHugger Robot [Thu, 9 Jun 2016 15:17:58 +0000 (15:17 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Bill Yi [Thu, 9 Jun 2016 14:22:06 +0000 (14:22 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am:
972b902171 -s ours
Change-Id: I83cbeb9a2398fdecc3f45f108e25258a53448bcd
TreeHugger Robot [Thu, 9 Jun 2016 14:18:09 +0000 (14:18 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Thu, 9 Jun 2016 14:15:24 +0000 (14:15 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Jason Monk [Thu, 9 Jun 2016 13:59:56 +0000 (09:59 -0400)]
QS: Fix crash when removing pages in RTL
Change-Id: Ic8f082a3dc61fbf12f576d4cffb8ab31e669cb7c
Fixes:
29122756
Bill Yi [Thu, 9 Jun 2016 13:57:21 +0000 (13:57 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am:
648c1112a6 -s ours
Change-Id: I798d6deb0c5d3c9e395fd31e1d5b1402aca79912
TreeHugger Robot [Thu, 9 Jun 2016 13:51:09 +0000 (13:51 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Thu, 9 Jun 2016 13:18:48 +0000 (06:18 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3b16ab55d23b155cf7893d95df528b1ed05dde9a
Auto-generated-cl: translation import
Bill Yi [Thu, 9 Jun 2016 12:58:16 +0000 (05:58 -0700)]
Import translations. DO NOT MERGE
Change-Id: I52bf310a3ce9ce0f923cf4840258726ea39a6c7a
Auto-generated-cl: translation import
Bill Yi [Thu, 9 Jun 2016 12:39:26 +0000 (05:39 -0700)]
Import translations. DO NOT MERGE
Change-Id: If53965a4f42f4c97334fc88250af6a72a9658b8a
Auto-generated-cl: translation import
Narayan Kamath [Thu, 9 Jun 2016 08:34:30 +0000 (08:34 +0000)]
PackageManagerService: fix NPE while renaming foreign dex markers.
am:
cf70a17a71
Change-Id: I0c70e239d046272b8165cfa885901fb543f2c100
Narayan Kamath [Tue, 7 Jun 2016 08:31:55 +0000 (09:31 +0100)]
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
Chad Brubaker [Thu, 9 Jun 2016 06:27:53 +0000 (06:27 +0000)]
Merge \"Don\'t depend directly on AppplicationInfo\" into nyc-dev
am:
55cf361d83
Change-Id: Idb332dd0b729b5394ff06ae611349b674b2e7f2c
TreeHugger Robot [Thu, 9 Jun 2016 06:22:19 +0000 (06:22 +0000)]
Merge "Don't depend directly on AppplicationInfo" into nyc-dev
Bill Yi [Thu, 9 Jun 2016 05:27:34 +0000 (22:27 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3234ff4e69fbcc40de1d78539fcc886957b5dce5
Auto-generated-cl: translation import
David Sehr [Thu, 9 Jun 2016 05:26:25 +0000 (05:26 +0000)]
Merge \"Simplify code paths computation, allow adb root to dump\" into nyc-dev
am:
1c4da6654f
Change-Id: Iad4d8712725819b35d9d25956fd82ff70ef3467d
David Sehr [Thu, 9 Jun 2016 05:20:19 +0000 (05:20 +0000)]
Merge "Simplify code paths computation, allow adb root to dump" into nyc-dev
Hugo Benichi [Thu, 9 Jun 2016 05:08:39 +0000 (05:08 +0000)]
Merge "ConnectivityMetricsLogger subclass for IpConnectivity" into nyc-mr1-dev
Chad Brubaker [Wed, 8 Jun 2016 19:57:46 +0000 (12:57 -0700)]
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
276ee969be89ba25e439839341953236adf80c40)
Change-Id: If638a716fd903b4e9dbabcbecb38bd4e26fef08c
Adam Lesinski [Thu, 9 Jun 2016 03:53:56 +0000 (03:53 +0000)]
Merge \"Throw proper exception in ResourcesManager\" into nyc-dev
am:
0d25fdd4a8
Change-Id: I156c373b858e99b892c66f941005409097937714
Erik Wolsheimer [Thu, 9 Jun 2016 03:48:55 +0000 (03:48 +0000)]
Merge \\\"DO NOT MERGE ANYWHERE Fix NPE when UID has no packages.\\\" into cw-e-dev am:
eae242cfe8 -s ours am:
8b04b0db2e -s ours
am:
24d94b8aa0 -s ours
Change-Id: If18c6e76195097f678d79eb538afb3f757a3b986
TreeHugger Robot [Thu, 9 Jun 2016 03:45:19 +0000 (03:45 +0000)]
Merge "Throw proper exception in ResourcesManager" into nyc-dev
Erik Wolsheimer [Thu, 9 Jun 2016 03:42:27 +0000 (03:42 +0000)]
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
Erik Wolsheimer [Thu, 9 Jun 2016 03:37:02 +0000 (03:37 +0000)]
Merge \"DO NOT MERGE ANYWHERE Fix NPE when UID has no packages.\" into cw-e-dev
am:
eae242cfe8 -s ours
Change-Id: Ia418392bcbab16d2c02689fdc79138b1cee304ab
Erik Wolsheimer [Thu, 9 Jun 2016 03:25:42 +0000 (03:25 +0000)]
Merge "DO NOT MERGE ANYWHERE Fix NPE when UID has no packages." into cw-e-dev
Bhavik Singh [Thu, 9 Jun 2016 03:06:14 +0000 (03:06 +0000)]
Merge "Logging tron metrics for ambient display gestures" into nyc-mr1-dev
fionaxu [Thu, 9 Jun 2016 02:47:11 +0000 (02:47 +0000)]
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
am:
9f0a266df9
Change-Id: I4f93659ef0569a357a3f902218edbbb2546719aa
fionaxu [Thu, 9 Jun 2016 02:39:54 +0000 (02:39 +0000)]
Merge \"resolve merge conflicts of
afed6f8 to nyc-dev\" into nyc-dev
am:
0c4f1c7e5c
Change-Id: I46be8494c88f03768e20bb702383f78cf38c1115
fionaxu [Thu, 9 Jun 2016 02:39:15 +0000 (02:39 +0000)]
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
sreevanis [Thu, 9 Jun 2016 02:35:55 +0000 (02:35 +0000)]
Merge \\\"docs: Documented how to handle alarms in AA media apps.\\\" into mnc-io-docs am:
21d6abf7be am:
539b6b7580
am:
e8ebd8aea0
Change-Id: I76ce0cb5254c571dd591dcb7547380fbd5fe8437
Chen Xu [Thu, 9 Jun 2016 02:32:51 +0000 (02:32 +0000)]
Merge "resolve merge conflicts of
afed6f8 to nyc-dev" into nyc-dev
Sreevani Sreejith [Thu, 9 Jun 2016 02:28:58 +0000 (02:28 +0000)]
Merge \\"docs: Documented how to handle alarms in AA media apps.\\" into mnc-io-docs am:
21d6abf7be
am:
539b6b7580
Change-Id: I92cd1c4193e9e8920f28f3300d28bdc8bb6b04cd
sreevanis [Thu, 9 Jun 2016 02:23:30 +0000 (02:23 +0000)]
Merge \"docs: Documented how to handle alarms in AA media apps.\" into mnc-io-docs
am:
21d6abf7be
Change-Id: Id05d99983414d3884c0c90fb67eec224ca77c80b
Sreevani Sreejith [Thu, 9 Jun 2016 02:15:38 +0000 (02:15 +0000)]
Merge "docs: Documented how to handle alarms in AA media apps." into mnc-io-docs
sreevanis [Fri, 3 Jun 2016 19:43:52 +0000 (12:43 -0700)]
docs: Documented how to handle alarms in AA media apps.
Bug:
27708785
Change-Id: Iee2a676fd8adbcba00301932d5e5637ee21df224
Jim Miller [Thu, 9 Jun 2016 01:41:36 +0000 (01:41 +0000)]
Merge \"Always re-enable keyguard state when the user switches.\" into nyc-dev
am:
9e94c455f8
Change-Id: If2ebbeba6060fde2bb34e81f54bccdaa82430f6e
TreeHugger Robot [Thu, 9 Jun 2016 01:38:31 +0000 (01:38 +0000)]
Merge "Always re-enable keyguard state when the user switches." into nyc-dev
Bhavik Singh [Thu, 2 Jun 2016 01:25:59 +0000 (18:25 -0700)]
Logging tron metrics for ambient display gestures
Introducing new TRON metric (ACTION_AMBIENT_GESTURE)
and implementing logging for metric in DozeService.java
BUG=
27907309
Change-Id: I324b6ef65e251f62b277beb1cb76af25159dbd90
Jim Miller [Thu, 9 Jun 2016 00:34:36 +0000 (00:34 +0000)]
Merge \"Revert \"Temporarily increase timeout for devices with buggy driver\"\" into nyc-dev
am:
e36da9c8c9
Change-Id: I893b0a87751dcd7f4f5e7688a23e3604dd7a4534
TreeHugger Robot [Thu, 9 Jun 2016 00:28:52 +0000 (00:28 +0000)]
Merge "Revert "Temporarily increase timeout for devices with buggy driver"" into nyc-dev
Winson [Thu, 9 Jun 2016 00:27:07 +0000 (00:27 +0000)]
Forcing software in header button background ripples.
am:
18227e4831
Change-Id: Id257602161261fd73b08c0899648486c5bb33a66
Adam Lesinski [Thu, 9 Jun 2016 00:19:09 +0000 (17:19 -0700)]
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
fionaxu [Wed, 8 Jun 2016 23:05:56 +0000 (16:05 -0700)]
resolve merge conflicts of
afed6f8 to nyc-dev
Bug:
28557603
Change-Id: Icb19f3d031cce2d846d5f6e9ad4d28d002db6bac
Danny Epstein [Thu, 9 Jun 2016 00:22:29 +0000 (00:22 +0000)]
Merge "Reduce padding and font sizes for watch preferences. - Reduce icon size and padding. - Reduce widget padding. - Reduce font size of styles used in preferences." into nyc-mr1-dev
Winson [Wed, 8 Jun 2016 19:57:40 +0000 (12:57 -0700)]
Forcing software in header button background ripples.
Bug:
29133575
Change-Id: I21125e28208335f5b2c2adf06cb1c8199b3ca476
Yuchao Zhou [Wed, 8 Jun 2016 23:27:56 +0000 (23:27 +0000)]
Merge "Update enable/disable code to reduce flakiness" into nyc-mr1-dev
Adam Lesinski [Wed, 8 Jun 2016 22:55:39 +0000 (22:55 +0000)]
Merge \"Consume the first sample of KernelUidCpuTimeReader\" into nyc-dev
am:
e5417a3863
Change-Id: I6188a7261443e192fb355033f7ff1cc01ea47c33
George Mount [Wed, 8 Jun 2016 22:52:03 +0000 (22:52 +0000)]
Merge "Fix NPE in startup wizard caused by former change." into nyc-mr1-dev
TreeHugger Robot [Wed, 8 Jun 2016 22:49:23 +0000 (22:49 +0000)]
Merge "Consume the first sample of KernelUidCpuTimeReader" into nyc-dev
Danny Epstein [Thu, 2 Jun 2016 18:56:35 +0000 (11:56 -0700)]
Reduce padding and font sizes for watch preferences.
- Reduce icon size and padding.
- Reduce widget padding.
- Reduce font size of styles used in preferences.
BUG:
27779149
Change-Id: I9aa96b35dee54d3036c7fc83139a36bf383eb6ce
George Mount [Wed, 8 Jun 2016 22:13:52 +0000 (15:13 -0700)]
Fix NPE in startup wizard caused by former change.
Bug
29211438
Change-Id: I0c979c945e79a6982d97013f961b00db3c9a9f00
Svet Ganov [Wed, 8 Jun 2016 21:59:02 +0000 (21:59 +0000)]
Merge \"Teach persistable Uri grants about direct boot\" into nyc-dev
am:
7014eef54a
Change-Id: I5096120ecd7c2959724e7e16f6d0a0c3712c18fa
Svetoslav Ganov [Wed, 8 Jun 2016 21:54:39 +0000 (21:54 +0000)]
Merge "Teach persistable Uri grants about direct boot" into nyc-dev
Adarsh Fernando [Wed, 8 Jun 2016 21:21:37 +0000 (21:21 +0000)]
AS UI redirect for experimental to stable Gradle migration guide am:
c65f7e8071 am:
28f355bb63
am:
fe089e3dc5
Change-Id: I2d6f36df9319c52ac64ac32621bd1061815a3bdc
Adam Lesinski [Wed, 8 Jun 2016 21:19:09 +0000 (14:19 -0700)]
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
Adarsh Fernando [Wed, 8 Jun 2016 21:18:02 +0000 (21:18 +0000)]
AS UI redirect for experimental to stable Gradle migration guide am:
c65f7e8071
am:
28f355bb63
Change-Id: I5efe04ef8a2c7c3d7a226ee91beca0f89e48be37
Yuchao Zhou [Wed, 8 Jun 2016 17:07:39 +0000 (10:07 -0700)]
Update enable/disable code to reduce flakiness
Change-Id: I9d3f69ca583b365bb5f89cfe16adcd6e604614c6
Adarsh Fernando [Wed, 8 Jun 2016 21:12:56 +0000 (21:12 +0000)]
AS UI redirect for experimental to stable Gradle migration guide
am:
c65f7e8071
Change-Id: I6ebb598650756de2687b4ab73ef41e27b13c8b1c
Christopher Wiley [Wed, 8 Jun 2016 20:55:10 +0000 (20:55 +0000)]
Merge "Create frameworks-base-testutils lib" into nyc-mr1-dev
Christopher Wiley [Wed, 8 Jun 2016 20:55:10 +0000 (20:55 +0000)]
Merge changes from topic 'tethering-ownership' into nyc-mr1-dev
* changes:
Tethering: Own WiFi tethering state and lifetime
Use an ArrayMap instead of HashMap to track tether interfaces
Consolidate cleanup logic in TetherInterfaceSM.TetheredState
Annotate TetherInterfaceStateMachineTest for APCT
Rely on Tethering mutex for TetherInterfaceSM
Rename TetherInterfaceSM to TetherInterfaceStateMachine
Remove dead code from TetherInterfaceSM
Remove transient StartingState from TetherInterfaceSM
Expand test coverage of TetherInterfaceSM
Add demonstration unittest for TetherInterfaceSM
Extract TetherInterfaceSM to its own class.
Make Tethering.TetherInterfaceSM more self contained
Clean up class members in Tethering.TetherInterfaceSM
Fix trivial warnings in Tethering.java
Adarsh Fernando [Wed, 8 Jun 2016 20:42:37 +0000 (13:42 -0700)]
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
Robert Carr [Wed, 8 Jun 2016 20:28:17 +0000 (20:28 +0000)]
Merge \"Ensure pinned animation scaling is consistently applied.\" into nyc-dev
am:
3207d8f8a1
Change-Id: Id17634723fd1fce94cd62f29322a23c5f67dda89
Selim Cinek [Wed, 8 Jun 2016 20:28:12 +0000 (20:28 +0000)]
Merge changes I0ca13626,I3677ce54 into nyc-dev
am:
b99e19c729
Change-Id: Ied2e9dd7c4b3cd474f00018401e49f061a43a4cf
Jason Monk [Wed, 8 Jun 2016 20:28:08 +0000 (20:28 +0000)]
Merge \"QS Edit: Extra extra make sure hidden when locked\" into nyc-dev
am:
bbcb733d80
Change-Id: I048576c6a65ac4ca884dbca131b050dc8599ae3f
Jason Monk [Wed, 8 Jun 2016 20:28:06 +0000 (20:28 +0000)]
Merge \"QS: Fix leak in QSAnimator\" into nyc-dev
am:
fd6e7e6790
Change-Id: Ic648b5e22c18337cb1e71c93adfb78dcc9707bac
Jason Monk [Wed, 8 Jun 2016 20:28:04 +0000 (20:28 +0000)]
Merge \"QS: Show date even on small screens\" into nyc-dev
am:
883da638e2
Change-Id: I4bc7594fa5004c8d58933d9432a70353474f07e4
Adrian Roos [Wed, 8 Jun 2016 20:24:59 +0000 (20:24 +0000)]
Merge "Direct Reply: Add back emoji button" into nyc-dev
David Sehr [Wed, 8 Jun 2016 17:37:33 +0000 (10:37 -0700)]
Simplify code paths computation, allow adb root to dump
Bug:
28748264
Change-Id: I1aefa5d98e80b58d6ed500c5d2d610569cf25c3a
Jason Monk [Wed, 8 Jun 2016 20:24:16 +0000 (16:24 -0400)]
resolve merge conflicts of
fbf366d to nyc-mr1-dev
Change-Id: If2c3d07d680c36b206fe49a8e8e7dc20619a5c42
TreeHugger Robot [Wed, 8 Jun 2016 20:23:02 +0000 (20:23 +0000)]
Merge "Re-add Internal API for cross-task Activity used by assistant." into nyc-mr1-dev
Adrian Roos [Fri, 3 Jun 2016 15:50:23 +0000 (08:50 -0700)]
Direct Reply: Add back emoji button
Bug:
29077108
Change-Id: Ibd1423465c5ec9aced4c4b77575a469f5e85f20d
Will Harmon [Wed, 8 Jun 2016 20:20:57 +0000 (20:20 +0000)]
Merge \"Fix crash when an app with an active quicksettings tile is updated to no longer have that tile.\" into nyc-dev
am:
4455fc734c
Change-Id: I3f5e4eb86d8a14393a853669a401090046a31da3
Jason Monk [Wed, 8 Jun 2016 20:20:52 +0000 (20:20 +0000)]
Merge \"Settings: Better handling for disabled tiles\" into nyc-dev
am:
27eadb6f1d
Change-Id: Iaf1558df689ba4ea033b081ba1c24b5d45d7e36c
Alan Viverette [Wed, 8 Jun 2016 20:20:44 +0000 (20:20 +0000)]
Merge \"Return correct default theme on API >= 24\" into nyc-dev
am:
afaa1e9db1
Change-Id: If520e4590d5d5b2832e3e53b25e95f6ca5e3b497
Julia Reynolds [Wed, 8 Jun 2016 20:20:43 +0000 (20:20 +0000)]
Merge \"Handle alarm firing outside of DND period.\" into nyc-dev
am:
e1451c4e30
Change-Id: I2fe8f9dbc048a830e6c06b4797151aaf306ca481
Felipe Leme [Wed, 8 Jun 2016 20:20:41 +0000 (20:20 +0000)]
Merge \"Wrap closeQuietly() on finally block.\" into nyc-dev
am:
fb5995cfbb
Change-Id: I5f649b54038b586be375394d35fd34453213df0a
TreeHugger Robot [Wed, 8 Jun 2016 20:08:37 +0000 (20:08 +0000)]
Merge "Ensure pinned animation scaling is consistently applied." into nyc-dev
TreeHugger Robot [Wed, 8 Jun 2016 20:03:50 +0000 (20:03 +0000)]
Merge "resolve merge conflicts of
718f321 to nyc-mr1-dev" into nyc-mr1-dev
Wei Wang [Wed, 8 Jun 2016 19:53:24 +0000 (19:53 +0000)]
Merge "Add launch power hint for activity launch end" into nyc-mr1-dev
Svet Ganov [Wed, 8 Jun 2016 16:40:47 +0000 (09:40 -0700)]
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
Selim Cinek [Wed, 8 Jun 2016 19:37:39 +0000 (19:37 +0000)]
Merge changes I0ca13626,I3677ce54 into nyc-dev
* changes:
Fixed a flicker when closing QS without notifications
Handled expandability and swiping while guts are exposed
Jason Monk [Wed, 8 Jun 2016 19:12:19 +0000 (19:12 +0000)]
Merge "QS Edit: Extra extra make sure hidden when locked" into nyc-dev
Jason Monk [Wed, 8 Jun 2016 19:12:05 +0000 (19:12 +0000)]
Merge "QS: Fix leak in QSAnimator" into nyc-dev
Jason Monk [Wed, 8 Jun 2016 19:11:40 +0000 (19:11 +0000)]
Merge "QS: Show date even on small screens" into nyc-dev
Jason Monk [Wed, 8 Jun 2016 19:11:15 +0000 (19:11 +0000)]
Merge "Fix crash when an app with an active quicksettings tile is updated to no longer have that tile." into nyc-dev
Will Harmon [Mon, 6 Jun 2016 19:54:59 +0000 (12:54 -0700)]
Fix crash when an app with an active quicksettings tile is updated to no longer have that tile.
Fixes:
28721139
Change-Id: Ib53c7cc08e9378420a5fed3459c1e17864b28802
Jason Monk [Wed, 8 Jun 2016 19:10:08 +0000 (19:10 +0000)]
Merge "Settings: Better handling for disabled tiles" into nyc-dev
Amith Yamasani [Wed, 8 Jun 2016 18:40:55 +0000 (11:40 -0700)]
resolve merge conflicts of
718f321 to nyc-mr1-dev
Change-Id: I0021aa5be1822082d8ff026cafa8c8b6b56b90b5
fionaxu [Wed, 8 Jun 2016 18:41:33 +0000 (18:41 +0000)]
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
fionaxu [Wed, 8 Jun 2016 18:33:22 +0000 (18:33 +0000)]
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
Ian Pedowitz [Wed, 8 Jun 2016 18:27:59 +0000 (18:27 +0000)]
Merge "Return correct default theme on API >= 24" into nyc-dev
fionaxu [Wed, 8 Jun 2016 18:24:16 +0000 (18:24 +0000)]
resolve merge conflicts of
2c53526 to lmp-mr1-dev am:
c196526f8e am:
1e8fe12f4e am:
965084dd0c am:
698e044717 am:
c95d552de0
am:
c10e4fae05
Change-Id: I8e5e9345aa8eeeae5a7af94a4cac892ee8e558ee
fionaxu [Wed, 8 Jun 2016 18:22:46 +0000 (18:22 +0000)]
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
Julia Reynolds [Wed, 8 Jun 2016 18:19:12 +0000 (18:19 +0000)]
Merge "Handle alarm firing outside of DND period." into nyc-dev
fionaxu [Wed, 8 Jun 2016 18:11:09 +0000 (18:11 +0000)]
resolve merge conflicts of
2c53526 to lmp-mr1-dev am:
c196526f8e am:
1e8fe12f4e am:
965084dd0c am:
698e044717
am:
c95d552de0
Change-Id: I4db8cef9678c409b7f0610d98f161e0e048a0333
Tianjie Xu [Wed, 8 Jun 2016 18:04:32 +0000 (18:04 +0000)]
Merge \"Change unit of I/O statistics to MiB\" into nyc-dev
am:
00681d0e78
Change-Id: I150ccc3c3164ee487bf4c726b080d885f8b39696
OSDN Git Service
