OSDN Git Service
Hall Liu [Thu, 6 Jul 2017 20:24:14 +0000 (20:24 +0000)]
Merge "Merge "Merge "Merge "Add a reason arg to streamStateUpdated" am:
6ba3829074" into stage-aosp-master am:
4c3be35123" into oc-dev-plus-aosp am:
b91a596c9b" into oc-dr1-dev-plus-aosp
am:
771a872178
Change-Id: Ia03a2a3a5f7675fc4ee88c1fb8cf64f91468c186
Hall Liu [Thu, 6 Jul 2017 20:21:56 +0000 (20:21 +0000)]
Merge "Merge "Merge "Merge "Add a reason arg to streamStateUpdated" am:
6ba3829074" into stage-aosp-master am:
4c3be35123" into oc-dev-plus-aosp am:
af3c9615f1" into oc-dr1-dev-plus-aosp
am:
5ca73a0f98
Change-Id: I2fc2bd394637aae37b95be3f132bd98100497f4f
Hiroki Yamamoto [Thu, 6 Jul 2017 20:20:13 +0000 (20:20 +0000)]
Merge "Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" into oc-dr1-dev am:
f259a1975b" into oc-dr1-dev-plus-aosp
am:
644c0a2690
Change-Id: Ief370d2eefa32003ff9809c0a36f972847bc645b
Phil Weaver [Thu, 6 Jul 2017 20:06:57 +0000 (20:06 +0000)]
Merge "Don't display new suppressed overlays"
TreeHugger Robot [Thu, 6 Jul 2017 20:01:21 +0000 (20:01 +0000)]
Merge "Don't clobber application's strict mode"
TreeHugger Robot [Thu, 6 Jul 2017 19:50:43 +0000 (19:50 +0000)]
Merge "Respect locale direction in TimePicker AM/PM location"
TreeHugger Robot [Thu, 6 Jul 2017 19:41:29 +0000 (19:41 +0000)]
Merge "Add tracing for UserState and a few services."
TreeHugger Robot [Thu, 6 Jul 2017 19:33:59 +0000 (19:33 +0000)]
Merge "Change storage migration to use quota APIs."
Android Build Merger (Role) [Thu, 6 Jul 2017 19:08:35 +0000 (19:08 +0000)]
Merge "Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" into oc-dr1-dev am:
f259a1975b am:
6e6b4f713f"
Hiroki Yamamoto [Thu, 6 Jul 2017 19:07:38 +0000 (19:07 +0000)]
Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" into oc-dr1-dev am:
f259a1975b
am:
6e6b4f713f
Change-Id: Iaf49a6db40f8f5c9b50929370319db796730d147
Android Build Merger (Role) [Thu, 6 Jul 2017 19:07:09 +0000 (19:07 +0000)]
Merge "Merge "Merge "Merge "Fix ContentObserver unregister issue" am:
09b6988e27" into stage-aosp-master am:
785ab04d7a" into oc-dev-plus-aosp am:
d6bb9401eb am:
f888e4248a"
Android Build Merger (Role) [Thu, 6 Jul 2017 19:06:43 +0000 (19:06 +0000)]
Merge "Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" into oc-dr1-dev am:
f259a1975b am:
6e6b4f713f"
Fyodor Kupolov [Thu, 6 Jul 2017 19:05:49 +0000 (19:05 +0000)]
Merge "Merge "Merge "Fix ContentObserver unregister issue" am:
09b6988e27" into stage-aosp-master am:
785ab04d7a" into oc-dev-plus-aosp am:
d6bb9401eb
am:
f888e4248a
Change-Id: If18658ae2273eb5f1681b18584cf75827b954ce5
Hiroki Yamamoto [Thu, 6 Jul 2017 19:05:27 +0000 (19:05 +0000)]
Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" into oc-dr1-dev am:
f259a1975b
am:
6e6b4f713f
Change-Id: I699b77d13cbb759ea1d06b4db048fb9a68b0f579
Android Build Merger (Role) [Thu, 6 Jul 2017 19:05:15 +0000 (19:05 +0000)]
Merge "Merge "Merge "Merge "Fix ContentObserver unregister issue" am:
09b6988e27" into stage-aosp-master am:
785ab04d7a" into oc-dev-plus-aosp am:
f035f800b7 am:
6b4b8e50c5"
Android Build Merger (Role) [Thu, 6 Jul 2017 19:05:00 +0000 (19:05 +0000)]
Merge "Merge "Merge "Merge "Fix ContentObserver unregister issue" am:
09b6988e27" into stage-aosp-master am:
785ab04d7a" into oc-dev-plus-aosp am:
d6bb9401eb am:
f888e4248a"
Fyodor Kupolov [Thu, 6 Jul 2017 19:03:43 +0000 (19:03 +0000)]
Merge "Merge "Merge "Fix ContentObserver unregister issue" am:
09b6988e27" into stage-aosp-master am:
785ab04d7a" into oc-dev-plus-aosp am:
f035f800b7
am:
6b4b8e50c5
Change-Id: If18e1bc0e96bca4ba6cbefdf7a96b5524567dc49
Fyodor Kupolov [Thu, 6 Jul 2017 19:03:33 +0000 (19:03 +0000)]
Merge "Merge "Merge "Fix ContentObserver unregister issue" am:
09b6988e27" into stage-aosp-master am:
785ab04d7a" into oc-dev-plus-aosp am:
d6bb9401eb
am:
f888e4248a
Change-Id: I789b3c22df6bb9b7eebd8beb5d9cd968a50c460e
Android Build Merger (Role) [Thu, 6 Jul 2017 19:03:19 +0000 (19:03 +0000)]
Merge "Merge "Merge "Fix ContentObserver unregister issue" am:
09b6988e27 am:
481d92c517" into oc-dev-plus-aosp am:
6c6b3820f7 am:
40e4512ad6"
Fyodor Kupolov [Thu, 6 Jul 2017 19:01:53 +0000 (19:01 +0000)]
Merge "Merge "Merge "Fix ContentObserver unregister issue" am:
09b6988e27" into stage-aosp-master am:
785ab04d7a" into oc-dev-plus-aosp am:
f035f800b7
am:
6b4b8e50c5
Change-Id: I6415e3e5fca39bc3577bea00830bb0ed12692d46
Fyodor Kupolov [Thu, 6 Jul 2017 19:01:37 +0000 (19:01 +0000)]
Merge "Merge "Fix ContentObserver unregister issue" am:
09b6988e27 am:
481d92c517" into oc-dev-plus-aosp am:
6c6b3820f7
am:
40e4512ad6
Change-Id: I46ebc84f9f34db6a5e78c24997bba5324ced8b17
Fyodor Kupolov [Thu, 6 Jul 2017 19:00:21 +0000 (19:00 +0000)]
Merge "Merge "Fix ContentObserver unregister issue" am:
09b6988e27 am:
481d92c517" into oc-dev-plus-aosp am:
6c6b3820f7
am:
40e4512ad6
Change-Id: I129746e6ab18e6f433f6a8500773b2d5a7290b56
TreeHugger Robot [Thu, 6 Jul 2017 18:54:49 +0000 (18:54 +0000)]
Merge "Return result when set tile enabled/disabled"
Android Build Merger (Role) [Thu, 6 Jul 2017 18:51:30 +0000 (18:51 +0000)]
Merge "Merge "Merge "Merge "Add a reason arg to streamStateUpdated" am:
6ba3829074" into stage-aosp-master am:
4c3be35123" into oc-dev-plus-aosp am:
b91a596c9b" into oc-dr1-dev-plus-aosp
Hall Liu [Thu, 6 Jul 2017 18:49:59 +0000 (18:49 +0000)]
Merge "Merge "Merge "Add a reason arg to streamStateUpdated" am:
6ba3829074" into stage-aosp-master am:
4c3be35123" into oc-dev-plus-aosp
am:
b91a596c9b
Change-Id: I7b21ffc84d7c53ae68ae3ca61b3bcca107df141d
Android Build Merger (Role) [Thu, 6 Jul 2017 18:49:29 +0000 (18:49 +0000)]
Merge "Merge "Merge "Merge "Add a reason arg to streamStateUpdated" am:
6ba3829074" into stage-aosp-master am:
4c3be35123" into oc-dev-plus-aosp am:
af3c9615f1" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 6 Jul 2017 18:48:27 +0000 (18:48 +0000)]
Merge "Merge "Fix ContentObserver unregister issue" am:
09b6988e27 am:
481d92c517 am:
aee5787b48 am:
16ff7bc82a"
Android Build Merger (Role) [Thu, 6 Jul 2017 18:48:03 +0000 (18:48 +0000)]
Merge "Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" into oc-dr1-dev am:
f259a1975b" into oc-dr1-dev-plus-aosp
Hall Liu [Thu, 6 Jul 2017 18:47:57 +0000 (18:47 +0000)]
Merge "Merge "Merge "Add a reason arg to streamStateUpdated" am:
6ba3829074" into stage-aosp-master am:
4c3be35123" into oc-dev-plus-aosp
am:
af3c9615f1
Change-Id: If16e4a6da97e2ee70f2a2ca8444fa24fa9210bf1
Android Build Merger (Role) [Thu, 6 Jul 2017 18:47:55 +0000 (18:47 +0000)]
Merge "Merge "Fix ContentObserver unregister issue" am:
09b6988e27 am:
481d92c517 am:
aee5787b48 am:
16ff7bc82a"
Fyodor Kupolov [Thu, 6 Jul 2017 18:47:19 +0000 (18:47 +0000)]
Merge "Fix ContentObserver unregister issue" am:
09b6988e27 am:
481d92c517 am:
aee5787b48
am:
16ff7bc82a
Change-Id: Id82a5e5c874c6fe4a24d5e3f9b095f208fc60533
Hiroki Yamamoto [Thu, 6 Jul 2017 18:47:09 +0000 (18:47 +0000)]
Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" into oc-dr1-dev
am:
f259a1975b
Change-Id: Ie16f4282d3881bc7f306d55aacc7c9f0585a1be0
TreeHugger Robot [Thu, 6 Jul 2017 18:47:00 +0000 (18:47 +0000)]
Merge "Include value of allowBackup in "dumpsys wallpaper""
Fyodor Kupolov [Thu, 6 Jul 2017 18:46:54 +0000 (18:46 +0000)]
Merge "Fix ContentObserver unregister issue" am:
09b6988e27 am:
481d92c517 am:
aee5787b48
am:
16ff7bc82a
Change-Id: Icf006b580ff47125e992fd208a89b909dd53e639
Hiroki Yamamoto [Thu, 6 Jul 2017 18:46:41 +0000 (18:46 +0000)]
Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" into oc-dr1-dev
am:
f259a1975b
Change-Id: I89bc4bb9469a1bd316eabe22abaf7ee2c10fc02c
Fyodor Kupolov [Thu, 6 Jul 2017 18:41:48 +0000 (18:41 +0000)]
Merge "Merge "Merge "Fix ContentObserver unregister issue" am:
09b6988e27" into stage-aosp-master am:
785ab04d7a" into oc-dev-plus-aosp
am:
d6bb9401eb
Change-Id: Ie879dcf1b443563f5e3e55e15eb0dca8670d325d
Fyodor Kupolov [Thu, 6 Jul 2017 18:40:20 +0000 (18:40 +0000)]
Merge "Merge "Merge "Fix ContentObserver unregister issue" am:
09b6988e27" into stage-aosp-master am:
785ab04d7a" into oc-dev-plus-aosp
am:
f035f800b7
Change-Id: I4cd47fea5a6e32d166295374ce3e5a898fe57110
Android Build Merger (Role) [Thu, 6 Jul 2017 18:39:03 +0000 (18:39 +0000)]
Merge "Merge "Merge "Add a reason arg to streamStateUpdated" am:
6ba3829074" into stage-aosp-master am:
4c3be35123" into oc-dev-plus-aosp
Fyodor Kupolov [Thu, 6 Jul 2017 18:38:57 +0000 (18:38 +0000)]
Merge "Merge "Fix ContentObserver unregister issue" am:
09b6988e27 am:
481d92c517" into oc-dev-plus-aosp
am:
6c6b3820f7
Change-Id: Ic03a469684e57e6c703d55cef69bedd6eabd1664
Android Build Merger (Role) [Thu, 6 Jul 2017 18:38:02 +0000 (18:38 +0000)]
Merge "Merge "Merge "Add a reason arg to streamStateUpdated" am:
6ba3829074" into stage-aosp-master am:
4c3be35123" into oc-dev-plus-aosp
Hall Liu [Thu, 6 Jul 2017 18:37:59 +0000 (18:37 +0000)]
Merge "Merge "Add a reason arg to streamStateUpdated" am:
6ba3829074" into stage-aosp-master
am:
4c3be35123
Change-Id: I7a352def470a54916129fb9fc90239658847a02f
Fyodor Kupolov [Thu, 6 Jul 2017 18:37:34 +0000 (18:37 +0000)]
Merge "Fix ContentObserver unregister issue" am:
09b6988e27 am:
481d92c517
am:
aee5787b48
Change-Id: I6cbd47b7158d5ccd207c0ce57ca613ebc7822b5f
Hall Liu [Thu, 6 Jul 2017 18:36:42 +0000 (18:36 +0000)]
Merge "Merge "Add a reason arg to streamStateUpdated" am:
6ba3829074" into stage-aosp-master
am:
4c3be35123
Change-Id: I3fe46bf58306211ca49557a8fc2131caf902b2cf
TreeHugger Robot [Thu, 6 Jul 2017 18:35:25 +0000 (18:35 +0000)]
Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" into oc-dr1-dev
Android Build Merger (Role) [Thu, 6 Jul 2017 18:33:42 +0000 (18:33 +0000)]
Merge "Merge "Merge "Fix ContentObserver unregister issue" am:
09b6988e27" into stage-aosp-master am:
785ab04d7a" into oc-dev-plus-aosp
Android Build Merger (Role) [Thu, 6 Jul 2017 18:33:32 +0000 (18:33 +0000)]
Merge "Merge "Merge "Fix ContentObserver unregister issue" am:
09b6988e27" into stage-aosp-master am:
785ab04d7a" into oc-dev-plus-aosp
Fyodor Kupolov [Thu, 6 Jul 2017 18:32:42 +0000 (18:32 +0000)]
Merge "Merge "Fix ContentObserver unregister issue" am:
09b6988e27" into stage-aosp-master
am:
785ab04d7a
Change-Id: I3f75c0bd9928013ce04b86a93e16f43eacb3a588
Fyodor Kupolov [Thu, 6 Jul 2017 18:32:37 +0000 (18:32 +0000)]
Merge "Merge "Fix ContentObserver unregister issue" am:
09b6988e27" into stage-aosp-master
am:
785ab04d7a
Change-Id: I63d56be90cdf022d01fa2bf4b79d228f48e19eb1
Android Build Merger (Role) [Thu, 6 Jul 2017 18:32:12 +0000 (18:32 +0000)]
Merge "Merge "Fix ContentObserver unregister issue" am:
09b6988e27 am:
481d92c517" into oc-dev-plus-aosp
Kurt Nelson [Fri, 30 Jun 2017 00:20:56 +0000 (17:20 -0700)]
Don't clobber application's strict mode
Applications often configure strict mode in Application.onCreate. A
regression was added in I2614f8bb30203e00953b1978bbcaf24d84d0397b that
applied a strict mode override for a longer period of time than needed.
Test: Launched a few applications
Bug:
36951662
Change-Id: I30b3eafa4a833fc42d0a938da9446007ade80480
Fyodor Kupolov [Thu, 6 Jul 2017 18:31:14 +0000 (18:31 +0000)]
Merge "Fix ContentObserver unregister issue" am:
09b6988e27
am:
481d92c517
Change-Id: Icad1a472602443fe5a4931cf6181411e15b4c68f
Fyodor Kupolov [Thu, 6 Jul 2017 18:30:44 +0000 (18:30 +0000)]
Merge "Fix ContentObserver unregister issue" am:
09b6988e27
am:
481d92c517
Change-Id: I2f6cfe7465a9816815172db2fb3defa8f49bdd31
Daniel Nishi [Thu, 6 Jul 2017 18:29:53 +0000 (18:29 +0000)]
Merge "Add a Setting for whether or not we have been disabled by policy."
Android Build Merger (Role) [Thu, 6 Jul 2017 18:25:41 +0000 (18:25 +0000)]
Merge "Merge "Add a reason arg to streamStateUpdated" am:
6ba3829074" into stage-aosp-master
Hall Liu [Thu, 6 Jul 2017 18:24:02 +0000 (18:24 +0000)]
Merge "Add a reason arg to streamStateUpdated"
am:
6ba3829074
Change-Id: I0c05734f18d58d7693d8777a4d1bb7950a5f54af
Android Build Merger (Role) [Thu, 6 Jul 2017 18:23:57 +0000 (18:23 +0000)]
Merge "Merge "Fix ContentObserver unregister issue" am:
09b6988e27" into stage-aosp-master
Fyodor Kupolov [Thu, 6 Jul 2017 18:22:49 +0000 (18:22 +0000)]
Merge "Fix ContentObserver unregister issue"
am:
09b6988e27
Change-Id: Ia9573b2cb453d3ff493a691675bee0f5dfc44396
Fyodor Kupolov [Thu, 6 Jul 2017 18:21:54 +0000 (18:21 +0000)]
Merge "Fix ContentObserver unregister issue"
am:
09b6988e27
Change-Id: I242e87b53f603a05ba7c4069662456457a3d980a
Android Build Merger (Role) [Thu, 6 Jul 2017 18:18:58 +0000 (18:18 +0000)]
Merge "Merge "Merge "Password field colors" into oc-dr1-dev am:
e21a151fe7" into oc-dr1-dev-plus-aosp am:
8d1471aebe"
Lucas Dupin [Thu, 6 Jul 2017 18:17:19 +0000 (18:17 +0000)]
Merge "Merge "Password field colors" into oc-dr1-dev am:
e21a151fe7" into oc-dr1-dev-plus-aosp
am:
8d1471aebe
Change-Id: I04fb9e7ca25320454f9a51b45a4cbe3931908d18
Android Build Merger (Role) [Thu, 6 Jul 2017 18:16:41 +0000 (18:16 +0000)]
Merge "Merge "Password field colors" into oc-dr1-dev am:
e21a151fe7 am:
1ea58e5016"
Scott Randolph [Thu, 6 Jul 2017 18:16:27 +0000 (18:16 +0000)]
Merge "Fix typo in AudioPolicy comments"
Lucas Dupin [Thu, 6 Jul 2017 18:15:07 +0000 (18:15 +0000)]
Merge "Password field colors" into oc-dr1-dev am:
e21a151fe7
am:
1ea58e5016
Change-Id: I9e0551fc0ec8d17fa92f9e40679b2c2956566f97
Android Build Merger (Role) [Thu, 6 Jul 2017 18:14:31 +0000 (18:14 +0000)]
Merge "Merge "Merge "AOD: Skip window animations while dozing" into oc-dr1-dev am:
92b6b7090c" into oc-dr1-dev-plus-aosp am:
d88cfb5345"
Adrian Roos [Thu, 6 Jul 2017 18:13:25 +0000 (18:13 +0000)]
Merge "Merge "AOD: Skip window animations while dozing" into oc-dr1-dev am:
92b6b7090c" into oc-dr1-dev-plus-aosp
am:
d88cfb5345
Change-Id: I3dd45ecf89eedafcc99707b99b77ab7448532d1f
Adrian Roos [Thu, 6 Jul 2017 18:10:37 +0000 (18:10 +0000)]
Merge "Merge "AOD: Skip window animations while dozing" into oc-dr1-dev am:
92b6b7090c" into oc-dr1-dev-plus-aosp
am:
d88cfb5345
Change-Id: I7419f044c4f2c3b04b10b563661a4984496043d6
Adrian Roos [Thu, 6 Jul 2017 18:08:36 +0000 (18:08 +0000)]
Merge "AOD: Skip window animations while dozing" into oc-dr1-dev am:
92b6b7090c
am:
fd9d88beb3
Change-Id: I76a5fdc6db9a849eeacf47278391e5d7eae53fc2
Android Build Merger (Role) [Thu, 6 Jul 2017 18:08:32 +0000 (18:08 +0000)]
Merge "Merge "Password field colors" into oc-dr1-dev am:
e21a151fe7" into oc-dr1-dev-plus-aosp
Hall Liu [Thu, 6 Jul 2017 18:08:02 +0000 (18:08 +0000)]
Merge "Add a reason arg to streamStateUpdated"
Lucas Dupin [Thu, 6 Jul 2017 18:07:42 +0000 (18:07 +0000)]
Merge "Password field colors" into oc-dr1-dev
am:
e21a151fe7
Change-Id: I1b0ba8bb0cfcc5a5b7002242f134873682decf7b
Lucas Dupin [Thu, 6 Jul 2017 18:07:09 +0000 (18:07 +0000)]
Merge "Password field colors" into oc-dr1-dev
am:
e21a151fe7
Change-Id: I71a11428363e20474f7bed44da68bd01e39fb3de
Fyodor Kupolov [Thu, 6 Jul 2017 18:07:04 +0000 (18:07 +0000)]
Merge "Fix ContentObserver unregister issue"
Android Build Merger (Role) [Thu, 6 Jul 2017 18:04:09 +0000 (18:04 +0000)]
Merge "Merge "AOD: Skip window animations while dozing" into oc-dr1-dev am:
92b6b7090c" into oc-dr1-dev-plus-aosp
Adrian Roos [Thu, 6 Jul 2017 18:03:11 +0000 (18:03 +0000)]
Merge "AOD: Skip window animations while dozing" into oc-dr1-dev
am:
92b6b7090c
Change-Id: If0fc6ed0c95587114df1e7f8950fb0df99812ae2
TreeHugger Robot [Thu, 6 Jul 2017 18:02:47 +0000 (18:02 +0000)]
Merge "Password field colors" into oc-dr1-dev
Adrian Roos [Thu, 6 Jul 2017 18:02:30 +0000 (18:02 +0000)]
Merge "AOD: Skip window animations while dozing" into oc-dr1-dev
am:
92b6b7090c
Change-Id: I834761678ad26b66ac3e3b93a1398d9fce5e0f6c
Jeff Sharkey [Thu, 6 Jul 2017 16:33:25 +0000 (10:33 -0600)]
Add tracing for UserState and a few services.
Both BackupManager and AppWidgetManager internals are taking a long
time to process user unlock events, so add tracing details. Also add
general tracing to show all UserState changes.
Bug:
32859180
Test: builds, boots
Change-Id: I82f4f7220ccb695941acd6bc45cd67a5fae8a4d2
TreeHugger Robot [Thu, 6 Jul 2017 17:53:24 +0000 (17:53 +0000)]
Merge "AOD: Skip window animations while dozing" into oc-dr1-dev
Android Build Merger (Role) [Thu, 6 Jul 2017 17:31:33 +0000 (17:31 +0000)]
Merge "Merge "Merge "Change visibility on formatPercentage(double)." into oc-dr1-dev am:
25937550af" into oc-dr1-dev-plus-aosp am:
5ecc5b10c2"
Android Build Merger (Role) [Thu, 6 Jul 2017 17:31:07 +0000 (17:31 +0000)]
Merge "Merge "Merge "Change visibility on formatPercentage(double)." into oc-dr1-dev am:
25937550af" into oc-dr1-dev-plus-aosp am:
5ecc5b10c2"
Daniel Nishi [Thu, 6 Jul 2017 17:29:37 +0000 (17:29 +0000)]
Merge "Merge "Change visibility on formatPercentage(double)." into oc-dr1-dev am:
25937550af" into oc-dr1-dev-plus-aosp
am:
5ecc5b10c2
Change-Id: Ic691721550e538fffa79081aaa98e86001e13366
Daniel Nishi [Thu, 6 Jul 2017 17:29:28 +0000 (17:29 +0000)]
Merge "Merge "Change visibility on formatPercentage(double)." into oc-dr1-dev am:
25937550af" into oc-dr1-dev-plus-aosp
am:
5ecc5b10c2
Change-Id: I1e55bfe47fffaa70f45a831e622dbbede56a65dc
Android Build Merger (Role) [Thu, 6 Jul 2017 17:29:11 +0000 (17:29 +0000)]
Merge "Merge "Change visibility on formatPercentage(double)." into oc-dr1-dev am:
25937550af am:
cda8602d8c"
Jeff Sharkey [Thu, 6 Jul 2017 17:29:06 +0000 (11:29 -0600)]
Change storage migration to use quota APIs.
New quota APIs are much faster than trying to measure manually, and
removing this last user of calculateDirectorySize() means we can
remove it once and for all.
Bug:
36056324
Test: builds, boots
Change-Id: Ibdf1ee4e8885680e106df6a9269b6309ddc61af8
Daniel Nishi [Thu, 6 Jul 2017 17:27:09 +0000 (17:27 +0000)]
Merge "Change visibility on formatPercentage(double)." into oc-dr1-dev am:
25937550af
am:
cda8602d8c
Change-Id: Ib3325eb9dab4f2f516075ee70678b2250e74e788
Daniel Nishi [Thu, 6 Jul 2017 17:26:57 +0000 (17:26 +0000)]
Merge "Change visibility on formatPercentage(double)." into oc-dr1-dev am:
25937550af
am:
cda8602d8c
Change-Id: I8a24fd2350c2d9731ab6825199fffc8ac77784cf
Android Build Merger (Role) [Thu, 6 Jul 2017 17:19:58 +0000 (17:19 +0000)]
Merge "Merge "Merge "Broadcast only if boot complete" into oc-dr1-dev am:
b60c48a6a2" into oc-dr1-dev-plus-aosp am:
7ebf4d91e5"
Android Build Merger (Role) [Thu, 6 Jul 2017 17:19:46 +0000 (17:19 +0000)]
Merge "Merge "Merge "Broadcast only if boot complete" into oc-dr1-dev am:
b60c48a6a2" into oc-dr1-dev-plus-aosp am:
7ebf4d91e5"
Android Build Merger (Role) [Thu, 6 Jul 2017 17:18:55 +0000 (17:18 +0000)]
Merge "Merge "Change visibility on formatPercentage(double)." into oc-dr1-dev am:
25937550af" into oc-dr1-dev-plus-aosp
Jerry Zhang [Thu, 6 Jul 2017 17:18:51 +0000 (17:18 +0000)]
Merge "Merge "Broadcast only if boot complete" into oc-dr1-dev am:
b60c48a6a2" into oc-dr1-dev-plus-aosp
am:
7ebf4d91e5
Change-Id: I766cacd5af61feb15bed445f8cc073e713a922ba
Jerry Zhang [Thu, 6 Jul 2017 17:18:38 +0000 (17:18 +0000)]
Merge "Merge "Broadcast only if boot complete" into oc-dr1-dev am:
b60c48a6a2" into oc-dr1-dev-plus-aosp
am:
7ebf4d91e5
Change-Id: I4e585ae2d71c391fd0831a129a2bb53f929cf439
Android Build Merger (Role) [Thu, 6 Jul 2017 17:18:21 +0000 (17:18 +0000)]
Merge "Merge "Broadcast only if boot complete" into oc-dr1-dev am:
b60c48a6a2 am:
4501186a6c"
Jerry Zhang [Thu, 6 Jul 2017 17:17:25 +0000 (17:17 +0000)]
Merge "Broadcast only if boot complete" into oc-dr1-dev am:
b60c48a6a2
am:
4501186a6c
Change-Id: Ia8cdf4bb74d766d131eaab1763f1a6d12aa9ed20
Daniel Nishi [Thu, 6 Jul 2017 17:17:11 +0000 (17:17 +0000)]
Merge "Change visibility on formatPercentage(double)." into oc-dr1-dev
am:
25937550af
Change-Id: If4b01fcf9e984546f9242446dcb3d02efe4725af
Jerry Zhang [Thu, 6 Jul 2017 17:17:02 +0000 (17:17 +0000)]
Merge "Broadcast only if boot complete" into oc-dr1-dev am:
b60c48a6a2
am:
4501186a6c
Change-Id: Ib65430aa0ff6a115fcd867fc6c8c0e4e7d9a03fc
Daniel Nishi [Thu, 6 Jul 2017 17:15:24 +0000 (17:15 +0000)]
Merge "Change visibility on formatPercentage(double)." into oc-dr1-dev
am:
25937550af
Change-Id: I53435cc58c29fd72cecca91e730cbfd745c35ef6
Android Build Merger (Role) [Thu, 6 Jul 2017 17:12:04 +0000 (17:12 +0000)]
Merge "Merge "Broadcast only if boot complete" into oc-dr1-dev am:
b60c48a6a2" into oc-dr1-dev-plus-aosp
Jerry Zhang [Thu, 6 Jul 2017 17:10:55 +0000 (17:10 +0000)]
Merge "Broadcast only if boot complete" into oc-dr1-dev
am:
b60c48a6a2
Change-Id: I53d2958b56ee6b48457741268e8578dc3316091c
Jerry Zhang [Thu, 6 Jul 2017 17:10:40 +0000 (17:10 +0000)]
Merge "Broadcast only if boot complete" into oc-dr1-dev
am:
b60c48a6a2
Change-Id: I99f2ec3d45fa69be68aa52aa769929645f8432cf
Doris Ling [Thu, 6 Jul 2017 17:09:11 +0000 (17:09 +0000)]
Merge "Update the max height/width attribute of the TwoTargetPreference icon."
OSDN Git Service
