OSDN Git Service
Christopher Tate [Tue, 27 Jun 2017 22:42:20 +0000 (22:42 +0000)]
Merge "Don't apply locale as part of deferred restore" into oc-dr1-dev am:
cbd1f32fdb
am:
5cff1f9e2f
Change-Id: Ibdd8747e88baad873145ff467fc2e22b66362cc9
Christopher Tate [Tue, 27 Jun 2017 22:36:18 +0000 (22:36 +0000)]
Merge "Don't apply locale as part of deferred restore" into oc-dr1-dev
am:
cbd1f32fdb
Change-Id: Ib6470c085ac5fe023bdbf45523a8c548e202f318
TreeHugger Robot [Tue, 27 Jun 2017 22:30:11 +0000 (22:30 +0000)]
Merge "Don't apply locale as part of deferred restore" into oc-dr1-dev
Christine Franks [Tue, 27 Jun 2017 22:09:27 +0000 (22:09 +0000)]
Merge "Blacklist Night display settings for testing" into oc-dr1-dev am:
4608c69f23
am:
02808bc7c9
Change-Id: Ibaa6aa302992f1336ebf25e31d9102874eda72fa
Michal Karpinski [Tue, 27 Jun 2017 22:07:24 +0000 (22:07 +0000)]
Merge "Fix an NPE when cancelling full backup in BMS#endFullBackup()" into oc-dev am:
0d1b1a253a am:
a96694b49b
am:
ccacc2d5b0
Change-Id: Iabc0cbf36e4a3db814e7a3f9e6dcbfe23bfd7ac9
Todd Kennedy [Tue, 27 Jun 2017 21:59:45 +0000 (21:59 +0000)]
Merge "Merge "Use content type specified on the command line" into oc-dev am:
f89bf30312" into oc-dr1-dev am:
d635fb2003
am:
5f59c49e37
Change-Id: Iaa64a4e9148f2ce89344df9a0c6e1745963ae741
Christine Franks [Tue, 27 Jun 2017 21:59:34 +0000 (21:59 +0000)]
Merge "Blacklist Night display settings for testing" into oc-dr1-dev
am:
4608c69f23
Change-Id: I9af926344d9703b5754be9ef893527abf6d1a2c7
Michal Karpinski [Tue, 27 Jun 2017 21:57:50 +0000 (21:57 +0000)]
Merge "Fix an NPE when cancelling full backup in BMS#endFullBackup()" into oc-dev am:
0d1b1a253a
am:
a96694b49b
Change-Id: I4cd86be9aac1f13ee8ef67dc797a020e4940c62f
Evan Laird [Tue, 27 Jun 2017 21:53:56 +0000 (21:53 +0000)]
Merge "Set bolt and plus colors together" into oc-dr1-dev am:
c86a5dbee4
am:
b46ac20120
Change-Id: I1bae9a6270fbc8c40095e6278dd87b6ce6beafd2
Christine Franks [Tue, 27 Jun 2017 21:52:12 +0000 (21:52 +0000)]
Merge "Blacklist Night display settings for testing" into oc-dr1-dev
Todd Kennedy [Tue, 27 Jun 2017 21:51:18 +0000 (21:51 +0000)]
Merge "Merge "Use content type specified on the command line" into oc-dev am:
f89bf30312" into oc-dr1-dev
am:
d635fb2003
Change-Id: I10d93e317386856ca6dda4fd920bf71e3eabcb02
Evan Laird [Tue, 27 Jun 2017 21:47:58 +0000 (21:47 +0000)]
Merge "Set bolt and plus colors together" into oc-dr1-dev
am:
c86a5dbee4
Change-Id: I16ac7e9a14a00573beef6db44390720b3bf5530d
Michal Karpinski [Tue, 27 Jun 2017 21:47:36 +0000 (21:47 +0000)]
Merge "Fix an NPE when cancelling full backup in BMS#endFullBackup()" into oc-dev
am:
0d1b1a253a
Change-Id: Idd633c178416ababe623f02327a830939ee769ba
Android Build Merger (Role) [Tue, 27 Jun 2017 21:43:42 +0000 (21:43 +0000)]
Merge "Merge "Use content type specified on the command line" into oc-dev am:
f89bf30312" into oc-dr1-dev
Todd Kennedy [Tue, 27 Jun 2017 21:42:07 +0000 (21:42 +0000)]
Merge "Use content type specified on the command line" into oc-dev
am:
f89bf30312
Change-Id: I2eafecfbf73333541a8b28726dc2af0a456443c0
TreeHugger Robot [Tue, 27 Jun 2017 21:40:53 +0000 (21:40 +0000)]
Merge "Set bolt and plus colors together" into oc-dr1-dev
TreeHugger Robot [Tue, 27 Jun 2017 21:36:35 +0000 (21:36 +0000)]
Merge "Import translations. DO NOT MERGE"
Sudheer Shanka [Tue, 27 Jun 2017 21:25:02 +0000 (21:25 +0000)]
Merge "Don't callback if all the delta values are zero."
Sudheer Shanka [Tue, 27 Jun 2017 21:24:25 +0000 (21:24 +0000)]
Merge "Check and block for network connectivity in onStart as well."
Sudheer Shanka [Tue, 27 Jun 2017 21:23:44 +0000 (21:23 +0000)]
Merge "Notify BatteryStatsService after the process is killed."
Michal Karpinski [Tue, 27 Jun 2017 21:02:57 +0000 (21:02 +0000)]
Merge "Fix an NPE when cancelling full backup in BMS#endFullBackup()" into oc-dev am:
0d1b1a253a am:
4b48d48a19
am:
2ceefbf767
Change-Id: I1cef46b35a89fd91dce268089757fc2edcccbff4
Todd Kennedy [Tue, 27 Jun 2017 20:58:11 +0000 (20:58 +0000)]
Merge "Use content type specified on the command line" into oc-dev am:
f89bf30312 am:
1f56ccf5f0
am:
5b3c1af460
Change-Id: If593116112316c4126767d6769594cc9166e2663
Michal Karpinski [Tue, 27 Jun 2017 20:56:08 +0000 (20:56 +0000)]
Merge "Fix an NPE when cancelling full backup in BMS#endFullBackup()" into oc-dev am:
0d1b1a253a
am:
4b48d48a19
Change-Id: I6e35567cd376666fefb1e9356ce7325595507f77
Todd Kennedy [Tue, 27 Jun 2017 20:49:14 +0000 (20:49 +0000)]
Merge "Use content type specified on the command line" into oc-dev am:
f89bf30312
am:
1f56ccf5f0
Change-Id: Ib0fa2e896764407ad22d199523bb0213e864ee35
Michal Karpinski [Tue, 27 Jun 2017 20:46:55 +0000 (20:46 +0000)]
Merge "Fix an NPE when cancelling full backup in BMS#endFullBackup()" into oc-dev
am:
0d1b1a253a
Change-Id: Id2e6a870ff207eb25844ecbeca6b80630b2e0d28
Todd Kennedy [Tue, 27 Jun 2017 20:40:47 +0000 (20:40 +0000)]
Merge "Use content type specified on the command line" into oc-dev
am:
f89bf30312
Change-Id: I33dc8db8cf347b43a404cb0d33b7f6a0a005da6a
Shishir Agrawal [Tue, 27 Jun 2017 20:35:11 +0000 (20:35 +0000)]
Merge "Supress roaming indications during a carrier network change." into oc-dev am:
f1b57080a6 am:
9c1cdf2f1a
am:
badaf9013c
Change-Id: Id013ba20733dde0c8a734643bdaaa032e5a39cd4
TreeHugger Robot [Tue, 27 Jun 2017 20:33:23 +0000 (20:33 +0000)]
Merge "Fix an NPE when cancelling full backup in BMS#endFullBackup()" into oc-dev
TreeHugger Robot [Tue, 27 Jun 2017 20:30:45 +0000 (20:30 +0000)]
Merge "Use content type specified on the command line" into oc-dev
Winson Chung [Tue, 27 Jun 2017 20:27:57 +0000 (20:27 +0000)]
Merge "Merge "Adding additional check for zero-sized snapshot." into oc-dr1-dev am:
df2a3295ca" into oc-dr1-dev-plus-aosp
am:
b1f2552c56
Change-Id: Idd52f9ba0fb396208b28a632d8bbdf7489a9e63d
Bill Yi [Tue, 27 Jun 2017 20:26:30 +0000 (20:26 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am:
a0376f250f -s ours am:
fb1469df92 -s ours" into oc-dr1-dev-plus-aosp
am:
8f1ccc824c -s ours
Change-Id: Ic7140d196944adf7a925f3120de66aa3bb18457a
Shishir Agrawal [Tue, 27 Jun 2017 20:25:07 +0000 (20:25 +0000)]
Merge "Merge "Supress roaming indications during a carrier network change." into oc-dev am:
f1b57080a6 am:
78b024cb08" into oc-dr1-dev-plus-aosp
am:
c999d0d55d
Change-Id: Idbd6637c5ca5316dd983a421679271eeeef9a083
Shishir Agrawal [Tue, 27 Jun 2017 20:23:50 +0000 (20:23 +0000)]
Merge "Supress roaming indications during a carrier network change." into oc-dev am:
f1b57080a6
am:
9c1cdf2f1a
Change-Id: Ia875ed8ec18a6a8800d6c71691598664a3b214ed
Bill Yi [Tue, 27 Jun 2017 20:23:33 +0000 (20:23 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
8d16bcef26 -s ours
am:
b07d972011 -s ours
Change-Id: I01af0181ba1ebdcc1101f4a6234c0d29459a50a2
Bill Yi [Tue, 27 Jun 2017 20:21:59 +0000 (20:21 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
2619c76cb1 -s ours
am:
00d60d3076 -s ours
Change-Id: Ibfdc84594e644923ee2a894335ca9ff9bb5bf67c
Christopher Tate [Tue, 27 Jun 2017 00:35:26 +0000 (17:35 -0700)]
Don't apply locale as part of deferred restore
Once the user has entered normal usage their locale configuration is
essentially guaranteed to be what they intend to use. Don't override
it during deferred restore. (We distinguish based on whether the
device is already marked as 'provisioned'.)
Bug
62224214
Test: manual
Change-Id: Icedef6a86a2b8942937b1384b204def88f2238d2
Android Build Merger (Role) [Tue, 27 Jun 2017 20:17:45 +0000 (20:17 +0000)]
Merge "Merge "Adding additional check for zero-sized snapshot." into oc-dr1-dev am:
df2a3295ca" into oc-dr1-dev-plus-aosp
Bill Yi [Tue, 27 Jun 2017 20:16:27 +0000 (20:16 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
a0376f250f -s ours am:
503eab4469 -s ours
am:
ded6d159cc -s ours
Change-Id: I4aeb90be346036977929a62605b5c82050cbb36a
Winson Chung [Tue, 27 Jun 2017 20:16:16 +0000 (20:16 +0000)]
Merge "Adding additional check for zero-sized snapshot." into oc-dr1-dev
am:
df2a3295ca
Change-Id: I22d626a3bfc89960271b63eb404dbfbb5456aa0a
Android Build Merger (Role) [Tue, 27 Jun 2017 20:15:49 +0000 (20:15 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am:
a0376f250f -s ours am:
fb1469df92 -s ours" into oc-dr1-dev-plus-aosp
Bill Yi [Tue, 27 Jun 2017 20:14:06 +0000 (20:14 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
a0376f250f -s ours
am:
fb1469df92 -s ours
Change-Id: Ifb022132551c672231f4077e68d41b65ac6a2c2f
Android Build Merger (Role) [Tue, 27 Jun 2017 20:13:49 +0000 (20:13 +0000)]
Merge "Merge "Supress roaming indications during a carrier network change." into oc-dev am:
f1b57080a6 am:
78b024cb08" into oc-dr1-dev-plus-aosp
Bill Yi [Tue, 27 Jun 2017 20:12:54 +0000 (20:12 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
8d16bcef26 -s ours
Change-Id: I2282f0ab89638dce50ed3c6b3ad66604bfe4c1ee
Shishir Agrawal [Tue, 27 Jun 2017 20:12:32 +0000 (20:12 +0000)]
Merge "Supress roaming indications during a carrier network change." into oc-dev am:
f1b57080a6
am:
78b024cb08
Change-Id: I688c0d626be99fb1229d4b89e3f1bbdd62bc1c49
Bill Yi [Tue, 27 Jun 2017 20:11:39 +0000 (20:11 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
2619c76cb1 -s ours
Change-Id: Ibcb59e3ae4e87301aa97fd7f7f3e93c64a2ef0f3
Bill Yi [Tue, 27 Jun 2017 20:10:11 +0000 (20:10 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
852e0aacc2 -s ours
am:
ed8860238c -s ours
Change-Id: Ic97752e1d08ed4f9e8a9b914608f170f48cdc292
Shishir Agrawal [Tue, 27 Jun 2017 20:08:04 +0000 (20:08 +0000)]
Merge "Supress roaming indications during a carrier network change." into oc-dev
am:
f1b57080a6
Change-Id: I23d69f5d9b27f893f2b8e8c38f021900d5eb83c2
Bill Yi [Tue, 27 Jun 2017 20:06:09 +0000 (20:06 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
a0376f250f -s ours
am:
503eab4469 -s ours
Change-Id: I4144956fc0670fb706b11348ae140c122cde81a7
Shishir Agrawal [Tue, 27 Jun 2017 20:05:04 +0000 (20:05 +0000)]
Merge "Supress roaming indications during a carrier network change." into oc-dev
am:
f1b57080a6
Change-Id: I879ad445f1dd1a2c39e71dd29bf155865318eead
Winson Chung [Tue, 27 Jun 2017 20:03:55 +0000 (20:03 +0000)]
Merge "Adding additional check for zero-sized snapshot." into oc-dr1-dev
Bill Yi [Tue, 27 Jun 2017 20:02:19 +0000 (20:02 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
852e0aacc2 -s ours
Change-Id: Ic393c2f71f4f0d5fe201936acaeded3be9c741d5
Bill Yi [Tue, 27 Jun 2017 20:01:46 +0000 (20:01 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
a0376f250f -s ours
Change-Id: I5331ee04e4cd08a2280e07c06f973329a3c41ab4
Bill Yi [Tue, 27 Jun 2017 19:59:48 +0000 (19:59 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
a0376f250f -s ours
Change-Id: Iebd88570c6104dceaa4344c0ab2f53f354fa0ba9
TreeHugger Robot [Tue, 27 Jun 2017 19:57:57 +0000 (19:57 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Tue, 27 Jun 2017 19:54:14 +0000 (19:54 +0000)]
Merge "Fixes grammatical error in InputMethodManager doc"
TreeHugger Robot [Tue, 27 Jun 2017 19:51:15 +0000 (19:51 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Shishir Agrawal [Tue, 27 Jun 2017 19:50:37 +0000 (19:50 +0000)]
Merge "Supress roaming indications during a carrier network change." into oc-dev
TreeHugger Robot [Tue, 27 Jun 2017 19:50:30 +0000 (19:50 +0000)]
Merge changes Ie5c878d3,I33d9be04
* changes:
Remove forward-lock install tests
Use PackageInstaller
TreeHugger Robot [Tue, 27 Jun 2017 19:49:42 +0000 (19:49 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Tue, 27 Jun 2017 19:49:03 +0000 (19:49 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Tue, 27 Jun 2017 19:44:47 +0000 (19:44 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Tue, 27 Jun 2017 19:38:10 +0000 (19:38 +0000)]
Merge "Update brightness icon to rounded one"
Evan Laird [Tue, 27 Jun 2017 19:32:56 +0000 (15:32 -0400)]
Set bolt and plus colors together
Also test to make sure the colors stay the same.
Test: runtest -x frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/graph/BatteryMeterDrawableBaseTest.java
Bug:
62668861
Change-Id: I7d01fd41aeedcb182dc05da8d7b0501a6b5b8539
TreeHugger Robot [Tue, 27 Jun 2017 19:32:39 +0000 (19:32 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Tue, 27 Jun 2017 19:20:29 +0000 (19:20 +0000)]
Merge "reflect errors to child package"
TreeHugger Robot [Tue, 27 Jun 2017 19:14:59 +0000 (19:14 +0000)]
Merge "Restore behavior of isUserRunning"
Android Build Merger (Role) [Tue, 27 Jun 2017 19:13:58 +0000 (19:13 +0000)]
Merge "Merge "Scrim opacity" into oc-dr1-dev am:
ce2ebd1285 am:
3e36e13cfa"
Lucas Dupin [Tue, 27 Jun 2017 19:13:07 +0000 (19:13 +0000)]
Merge "Scrim opacity" into oc-dr1-dev am:
ce2ebd1285
am:
3e36e13cfa
Change-Id: I408238eff55b469ff0407c72c504e4e1adcc9b8b
Android Build Merger (Role) [Tue, 27 Jun 2017 19:12:28 +0000 (19:12 +0000)]
Merge "Merge "Do not duck AAudio streams as a result of focus loss" into oc-dr1-dev am:
be6989cb9d am:
018e031d5d"
Jean-Michel Trivi [Tue, 27 Jun 2017 19:11:20 +0000 (19:11 +0000)]
Merge "Do not duck AAudio streams as a result of focus loss" into oc-dr1-dev am:
be6989cb9d
am:
018e031d5d
Change-Id: Ia28b0fcd08435f1ba98d1f1d6299f88d1afea8e5
Jeff Sharkey [Tue, 27 Jun 2017 19:10:55 +0000 (19:10 +0000)]
Merge "Only require that system UIDs tag their sockets."
Android Build Merger (Role) [Tue, 27 Jun 2017 19:08:41 +0000 (19:08 +0000)]
Merge "Merge "If the menu hasn't been created yet don't do things with it" into oc-dr1-dev am:
214baa034a am:
0d74be5e83"
Mady Mellor [Tue, 27 Jun 2017 19:07:45 +0000 (19:07 +0000)]
Merge "If the menu hasn't been created yet don't do things with it" into oc-dr1-dev am:
214baa034a
am:
0d74be5e83
Change-Id: Ide6ede97ae30fab4c53b1b2f405460384e24d6d1
Android Build Merger (Role) [Tue, 27 Jun 2017 19:07:19 +0000 (19:07 +0000)]
Merge "Merge "DO NOT MERGE: Add dynamic doze check for the active doze light sensor. am:
789954fb69 -s ours am:
1cd816eeac -s ours am:
c994b07e98 am:
77b001f910" into oc-dr1-dev-plus-aosp am:
a678041929"
Julius D'souza [Tue, 27 Jun 2017 19:06:21 +0000 (19:06 +0000)]
Merge "DO NOT MERGE: Add dynamic doze check for the active doze light sensor. am:
789954fb69 -s ours am:
1cd816eeac -s ours am:
c994b07e98 am:
77b001f910" into oc-dr1-dev-plus-aosp
am:
a678041929
Change-Id: Ibc380313251a94fdabdeac4b9d856887b664d3d8
Android Build Merger (Role) [Tue, 27 Jun 2017 19:05:41 +0000 (19:05 +0000)]
Merge "DO NOT MERGE: Add dynamic doze check for the active doze light sensor. am:
789954fb69 -s ours am:
1cd816eeac -s ours am:
c994b07e98 am:
21c7490f20 am:
29af0f0b45"
Julius D'souza [Tue, 27 Jun 2017 19:04:48 +0000 (19:04 +0000)]
DO NOT MERGE: Add dynamic doze check for the active doze light sensor. am:
789954fb69 -s ours am:
1cd816eeac -s ours am:
c994b07e98 am:
21c7490f20
am:
29af0f0b45
Change-Id: If038e3ced85f6cfb08cf6f20e80f05da9f948848
Android Build Merger (Role) [Tue, 27 Jun 2017 19:04:10 +0000 (19:04 +0000)]
Merge "Merge "Merge "IMS: Check for binderstate before calling endSession" am:
c49534cf09 am:
1de1c2bb66 am:
8f2950b2c4" into oc-dr1-dev-plus-aosp am:
d0b5ca2e26"
Brad Ebinger [Tue, 27 Jun 2017 19:03:11 +0000 (19:03 +0000)]
Merge "Merge "IMS: Check for binderstate before calling endSession" am:
c49534cf09 am:
1de1c2bb66 am:
8f2950b2c4" into oc-dr1-dev-plus-aosp
am:
d0b5ca2e26
Change-Id: Ie3b0ba66d5e954a2d2c23c70a0d35ea1b7660670
Android Build Merger (Role) [Tue, 27 Jun 2017 19:02:27 +0000 (19:02 +0000)]
Merge "Merge "Allow VR Virtual display to rotate with content." into oc-dr1-dev am:
9747b4ace5 am:
f251056e0d"
Lucas Dupin [Tue, 27 Jun 2017 19:02:05 +0000 (19:02 +0000)]
Merge "Scrim opacity" into oc-dr1-dev
am:
ce2ebd1285
Change-Id: Idf63df1a75f5db96d2129cac17c0189edeff46a7
Siyamed Sinir [Tue, 27 Jun 2017 19:01:46 +0000 (19:01 +0000)]
Merge "Migrate core TextView tests to JUnit4"
Alex Sakhartchouk [Tue, 27 Jun 2017 19:01:33 +0000 (19:01 +0000)]
Merge "Allow VR Virtual display to rotate with content." into oc-dr1-dev am:
9747b4ace5
am:
f251056e0d
Change-Id: I04d20a7cec15e321efd688b0dd7a5c740033cd99
Android Build Merger (Role) [Tue, 27 Jun 2017 19:00:54 +0000 (19:00 +0000)]
Merge "Merge "Enable getting text_color_primary via Java." into oc-dr1-dev am:
29d430c5cc am:
b7f44dfce9"
TreeHugger Robot [Tue, 27 Jun 2017 19:00:20 +0000 (19:00 +0000)]
Merge "Strip extenders on android go devices."
Andrew Sapperstein [Tue, 27 Jun 2017 18:59:22 +0000 (18:59 +0000)]
Merge "Enable getting text_color_primary via Java." into oc-dr1-dev am:
29d430c5cc
am:
b7f44dfce9
Change-Id: I1602e0d3fa6c42628e87720dae056757fc924bf3
Jean-Michel Trivi [Tue, 27 Jun 2017 18:55:39 +0000 (18:55 +0000)]
Merge "Do not duck AAudio streams as a result of focus loss" into oc-dr1-dev
am:
be6989cb9d
Change-Id: Icd3d46d60cdf8353690f3284b73f0adaaf50c9b8
TreeHugger Robot [Tue, 27 Jun 2017 18:53:45 +0000 (18:53 +0000)]
Merge "Scrim opacity" into oc-dr1-dev
TreeHugger Robot [Tue, 27 Jun 2017 18:46:24 +0000 (18:46 +0000)]
Merge "Do not duck AAudio streams as a result of focus loss" into oc-dr1-dev
TreeHugger Robot [Tue, 27 Jun 2017 18:41:23 +0000 (18:41 +0000)]
Merge "Add a stop user stress test"
Nick Felker [Mon, 26 Jun 2017 22:50:19 +0000 (15:50 -0700)]
Fixes grammatical error in InputMethodManager doc
Fixes:
29645208
Test: This is not a code change, so tests should be unaffected.
Change-Id: I8b76166f3a7f1c825dc9725f6d7fd8e8c96fe410
Udam Saini [Tue, 27 Jun 2017 17:59:09 +0000 (17:59 +0000)]
Merge "Adds necessary permissions to system apis"
Mady Mellor [Tue, 27 Jun 2017 17:54:58 +0000 (17:54 +0000)]
Merge "If the menu hasn't been created yet don't do things with it" into oc-dr1-dev
am:
214baa034a
Change-Id: Id0422df61723072291d37a6b19dc8bf783c8d2d8
TreeHugger Robot [Tue, 27 Jun 2017 17:45:48 +0000 (17:45 +0000)]
Merge "If the menu hasn't been created yet don't do things with it" into oc-dr1-dev
Shishir Agrawal [Mon, 26 Jun 2017 19:06:03 +0000 (12:06 -0700)]
Supress roaming indications during a carrier network change.
Change-Id: Ib39d229b67374c4ca30c3a2c8c3b0050106733cd
Fixes:
62795179
Test: NetworkControllerSignalTest
Evan Laird [Tue, 27 Jun 2017 17:33:40 +0000 (13:33 -0400)]
Update brightness icon to rounded one
Just an asset drop
Test: visual
Bug:
62668861
Change-Id: I11c8ddd99de90c319143292cd32441d14eb7fc1d
Tomasz Wasilczyk [Tue, 27 Jun 2017 17:31:58 +0000 (17:31 +0000)]
Merge "Fix Broadcast Radio test to not fail on HD Radio."
Android Build Merger (Role) [Tue, 27 Jun 2017 17:27:26 +0000 (17:27 +0000)]
Merge "DO NOT MERGE: Add dynamic doze check for the active doze light sensor. am:
789954fb69 -s ours am:
1cd816eeac -s ours am:
c994b07e98 am:
77b001f910" into oc-dr1-dev-plus-aosp
Julius D'souza [Tue, 27 Jun 2017 17:26:29 +0000 (17:26 +0000)]
DO NOT MERGE: Add dynamic doze check for the active doze light sensor. am:
789954fb69 -s ours am:
1cd816eeac -s ours am:
c994b07e98
am:
77b001f910
Change-Id: I5e98bc1085004caefaacf93fc1e628090dda359a
Julius D'souza [Tue, 27 Jun 2017 17:26:25 +0000 (17:26 +0000)]
DO NOT MERGE: Add dynamic doze check for the active doze light sensor. am:
789954fb69 -s ours am:
1cd816eeac -s ours am:
c994b07e98
am:
21c7490f20
Change-Id: I90bff1339549ea67176e605cef3b8c7d0071522f
OSDN Git Service
