OSDN Git Service
Andrew Scull [Tue, 17 Apr 2018 11:15:23 +0000 (04:15 -0700)]
Merge "LSS: pass secret to AuthSecret HAL when no credential" into pi-dev
am:
d7cea28bbc
Change-Id: I56d2f350a9efcf929ab83dc0bc3728fed4b39853
Benjamin Miller [Tue, 17 Apr 2018 11:06:20 +0000 (04:06 -0700)]
Merge "Docs: update the method description for installKeyPair() to cover parameter change." into pi-dev
am:
5037beea1c
Change-Id: I36650a1acc5e6eaf9c192f12927425c253bb0b6d
Andrew Scull [Tue, 17 Apr 2018 11:04:52 +0000 (11:04 +0000)]
Merge "LSS: pass secret to AuthSecret HAL when no credential" into pi-dev
Ricky Wai [Tue, 17 Apr 2018 10:58:14 +0000 (03:58 -0700)]
Merge "Do not generate non-primary profile watchlist report" into pi-dev
am:
421ec104af
Change-Id: Ief4aa2940fec1936abf94387181f7c0edb1bfe08
TreeHugger Robot [Tue, 17 Apr 2018 10:53:36 +0000 (10:53 +0000)]
Merge "Docs: update the method description for installKeyPair() to cover parameter change." into pi-dev
Dan Gittik [Tue, 17 Apr 2018 10:50:58 +0000 (03:50 -0700)]
Merge "Fixed power manager CTS test." into pi-dev
am:
15d35c1274
Change-Id: I375d0d77520a707cc76064a93def15faa5f8ddb1
Ricky Wai [Tue, 17 Apr 2018 10:40:21 +0000 (10:40 +0000)]
Merge "Do not generate non-primary profile watchlist report" into pi-dev
TreeHugger Robot [Tue, 17 Apr 2018 10:39:30 +0000 (10:39 +0000)]
Merge "Fixed power manager CTS test." into pi-dev
Andrew Scull [Fri, 13 Apr 2018 11:01:25 +0000 (12:01 +0100)]
LSS: pass secret to AuthSecret HAL when no credential
If there was once a credential, a secret will have been enrolled. When
the credential is removed, that secret is still enrolled but still needs
to be derived. This adds that derivation in the case that the secret is
enrolled by the user doesn't have a credential.
Bug:
77942316
Test: runtest frameworks-services -c com.android.server.locksettings.SyntheticPasswordTests
Change-Id: I099a9537ab0739830a234b5f4f3721f4e8476571
Salvador Martinez [Tue, 17 Apr 2018 07:35:00 +0000 (00:35 -0700)]
Merge "Make util method public" into pi-dev
am:
64e497672d
Change-Id: Iad466f4f1cd0b588e1afeb50411162940ffeee25
TreeHugger Robot [Tue, 17 Apr 2018 07:22:25 +0000 (07:22 +0000)]
Merge "Make util method public" into pi-dev
Peiyong Lin [Tue, 17 Apr 2018 06:06:04 +0000 (23:06 -0700)]
Merge "[JNI] Adapt graphics::common:V1_0::Hdr from HAL." into pi-dev
am:
16da326cf5
Change-Id: I9d5c757b393a8446683bc9c579b8e7d97f60c819
Peiyong Lin [Tue, 17 Apr 2018 05:57:30 +0000 (05:57 +0000)]
Merge "[JNI] Adapt graphics::common:V1_0::Hdr from HAL." into pi-dev
Stanley Tng [Tue, 17 Apr 2018 03:08:18 +0000 (20:08 -0700)]
Merge "Clarify API doc for BluetoothGattServer::addService" am:
f493c66f39
am:
478b35a2fd
Change-Id: Ia1d0ea90ceff6c0e39062de5e4cc000d76d51f7a
Stanley Tng [Tue, 17 Apr 2018 02:59:17 +0000 (19:59 -0700)]
Merge "Clarify API doc for BluetoothGattServer::addService"
am:
f493c66f39
Change-Id: If988cc85292426c6694732e2158ad698d740c93d
Stanley Tng [Tue, 17 Apr 2018 02:08:53 +0000 (19:08 -0700)]
Merge "Cleanup documentation for LE CoC in BluetoothAdapter" am:
7b25698549
am:
e93a622275
Change-Id: Ia23d8a96128420576d8b6ff5eae0075825df8c2f
Jean-Michel Trivi [Tue, 17 Apr 2018 02:04:48 +0000 (19:04 -0700)]
Merge "Source of deadlock between PlayerBase.mLock and PlaybackActivityMonitor.mPlayerLock:" am:
d53bd6b86e
am:
064cd7b3db
Change-Id: Ic545f31ca3df87710bbbe073685d7ed6aee52275
Stanley Tng [Tue, 17 Apr 2018 01:58:21 +0000 (18:58 -0700)]
Merge "Cleanup documentation for LE CoC in BluetoothAdapter"
am:
7b25698549
Change-Id: I5e7633c73c7ed7f9257acb4fb891fbaec8202f63
Jean-Michel Trivi [Tue, 17 Apr 2018 01:55:00 +0000 (18:55 -0700)]
Merge "Source of deadlock between PlayerBase.mLock and PlaybackActivityMonitor.mPlayerLock:"
am:
d53bd6b86e
Change-Id: I1408348aa98c9442de544b22cd9cddb9a1eac907
Tej Singh [Tue, 17 Apr 2018 01:51:54 +0000 (18:51 -0700)]
Merge "Enforce dump permission in stats service" into pi-dev
am:
abdf6e8039
Change-Id: I0034bd5f4452a0c8b68f9e261434897e03ab83c7
Rohan Shah [Tue, 17 Apr 2018 01:41:28 +0000 (18:41 -0700)]
Merge "[QS] Add PageIndicator to footer" into pi-dev
am:
84745ebe11
Change-Id: Ib1687654181f9ab0c44017e180f74ed7edaadfc9
Tej Singh [Tue, 17 Apr 2018 01:34:47 +0000 (01:34 +0000)]
Merge "Enforce dump permission in stats service" into pi-dev
Lucas Dupin [Tue, 17 Apr 2018 01:34:46 +0000 (18:34 -0700)]
Merge "Only fade clock away at the top of the screen" into pi-dev
am:
34a0b18a5c
Change-Id: I8ed589bbef7844065fd8be79b6c605db6d26b3de
Makoto Onuki [Tue, 17 Apr 2018 01:30:38 +0000 (18:30 -0700)]
Merge "Add 1-day sync stats in syncmanager dumpsys." into pi-dev
am:
d7732b4c8a
Change-Id: I7eeab220ca2d90623868e1e3f724961ad660da42
TreeHugger Robot [Tue, 17 Apr 2018 01:28:06 +0000 (01:28 +0000)]
Merge "[QS] Add PageIndicator to footer" into pi-dev
Dan Cashman [Tue, 17 Apr 2018 01:22:00 +0000 (18:22 -0700)]
Merge "InstantAppRegistry: adjust backwards compat cookie sig check." into pi-dev
am:
4a17a574f6
Change-Id: I8e45fcfec81859be5a7e19dba4a82e505827b958
Jeff Sharkey [Tue, 17 Apr 2018 01:10:40 +0000 (18:10 -0700)]
Merge "Add tracing for network statistics and policy." into pi-dev
am:
c359f49045
Change-Id: I2b6634c8df4dfe14fb4cd01bca6611e7cf7a0056
Jeff Sharkey [Tue, 17 Apr 2018 00:44:58 +0000 (17:44 -0700)]
Merge "Protect usage data with OP_GET_USAGE_STATS." into pi-dev
am:
936c0868f8
Change-Id: I3c84c646b3a79f09dc1210e18f48d1f87d38abd4
Malcolm Chen [Tue, 17 Apr 2018 00:39:13 +0000 (17:39 -0700)]
Merge "Fix UiccSlotInfo equals method." into pi-dev
am:
82c0b73e98
Change-Id: Ide54ab7f3b29b7bde846aa292f121bef0baa13cb
Christopher Tate [Tue, 17 Apr 2018 00:33:24 +0000 (17:33 -0700)]
Merge "Treat named standby states as ceilings of behavioral categories" into pi-dev
am:
f3015eb0df
Change-Id: I10e1114a4619c65c78d9177800ffe04b80039228
Tomasz Wasilczyk [Tue, 17 Apr 2018 00:19:56 +0000 (17:19 -0700)]
Merge "Remove setDeviceConnectionState hack for radio mute/unmute." into pi-dev
am:
0e07ed14a2
Change-Id: I22cd7b0373d006180e6beeb7c395f0d8976c380b
Lucas Dupin [Tue, 17 Apr 2018 00:14:22 +0000 (00:14 +0000)]
Merge "Only fade clock away at the top of the screen" into pi-dev
Makoto Onuki [Tue, 17 Apr 2018 00:11:25 +0000 (00:11 +0000)]
Merge "Add 1-day sync stats in syncmanager dumpsys." into pi-dev
TreeHugger Robot [Tue, 17 Apr 2018 00:09:14 +0000 (00:09 +0000)]
Merge "InstantAppRegistry: adjust backwards compat cookie sig check." into pi-dev
TreeHugger Robot [Tue, 17 Apr 2018 00:08:41 +0000 (00:08 +0000)]
Merge "Add tracing for network statistics and policy." into pi-dev
Treehugger Robot [Tue, 17 Apr 2018 00:07:38 +0000 (00:07 +0000)]
Merge "Clarify API doc for BluetoothGattServer::addService"
Jeff Sharkey [Tue, 17 Apr 2018 00:04:53 +0000 (00:04 +0000)]
Merge "Protect usage data with OP_GET_USAGE_STATS." into pi-dev
Hidenari Koshimae [Tue, 17 Apr 2018 00:02:46 +0000 (17:02 -0700)]
Merge "Camera: Fix a description for MONOCHROME camera capability" into pi-dev
am:
8be1197c5d
Change-Id: I41dc263a13f67e7d4772343b1c10f52383786bd2
Treehugger Robot [Tue, 17 Apr 2018 00:02:32 +0000 (00:02 +0000)]
Merge "Cleanup documentation for LE CoC in BluetoothAdapter"
Tyler Gunn [Mon, 16 Apr 2018 23:57:15 +0000 (16:57 -0700)]
Merge "Add permission whitelist for EmergencyInfo app." into pi-dev
am:
1417d6c543
Change-Id: I6edbde2c8cc7628703b45492d006f5c97485a083
TreeHugger Robot [Mon, 16 Apr 2018 23:56:06 +0000 (23:56 +0000)]
Merge "Fix UiccSlotInfo equals method." into pi-dev
Treehugger Robot [Mon, 16 Apr 2018 23:48:48 +0000 (23:48 +0000)]
Merge "Source of deadlock between PlayerBase.mLock and PlaybackActivityMonitor.mPlayerLock:"
TreeHugger Robot [Mon, 16 Apr 2018 23:48:41 +0000 (23:48 +0000)]
Merge "Treat named standby states as ceilings of behavioral categories" into pi-dev
Tomasz Wasilczyk [Mon, 16 Apr 2018 23:37:10 +0000 (23:37 +0000)]
Merge "Remove setDeviceConnectionState hack for radio mute/unmute." into pi-dev
Salvador Martinez [Fri, 13 Apr 2018 20:34:46 +0000 (13:34 -0700)]
Make util method public
A utility method is private but we need it elsewhere. This CL
just makes it public. Also it restricts the use of the method to
just rounding positive values to positive multiples. It is only
meant for rounding time.
Test: robotests
Bug:
77874313
Change-Id: Ieb222c7f752b6a907fca5f91ddd4f4a4b67a0d2a
Bill Yi [Mon, 16 Apr 2018 23:31:15 +0000 (16:31 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
309a2818b9 -s ours
Change-Id: Ie41b9bdd8fbeeb2951679352f0ff33d8779e90b6
TreeHugger Robot [Mon, 16 Apr 2018 23:25:39 +0000 (23:25 +0000)]
Merge "Camera: Fix a description for MONOCHROME camera capability" into pi-dev
Tyler Gunn [Mon, 16 Apr 2018 23:23:39 +0000 (23:23 +0000)]
Merge "Add permission whitelist for EmergencyInfo app." into pi-dev
David Chen [Mon, 16 Apr 2018 23:21:23 +0000 (16:21 -0700)]
Merge "Adds a code when statsd sends intent to getData." into pi-dev
am:
17d2de09cb
Change-Id: I4f429329603d7dfe512de6802d4f083d230fc4d1
Pavlin Radoslavov [Mon, 16 Apr 2018 23:09:02 +0000 (16:09 -0700)]
Merge "Add A2DP set/get active device to greylist" into pi-dev
am:
20afb74074
Change-Id: Ie8d76434404cec0cf34958828dd89bdf36632852
Android Build Merger (Role) [Mon, 16 Apr 2018 23:06:14 +0000 (23:06 +0000)]
Merge "Merge "Migrate android.test.base.stubs generation to Soong." am:
c263ce5e25 am:
cca80fbe4c" into pi-dev-plus-aosp
Nan Zhang [Mon, 16 Apr 2018 23:05:50 +0000 (16:05 -0700)]
Merge "Migrate android.test.base.stubs generation to Soong." am:
c263ce5e25
am:
cca80fbe4c
Change-Id: I352387b460e7969356f9cc355dd92f83771aa3a7
Dan Cashman [Mon, 16 Apr 2018 23:04:34 +0000 (16:04 -0700)]
Merge "Replace PackageInfo#signingCertificateHistory field doc reference." into pi-dev
am:
82f36b120d
Change-Id: I6a0b86e427ecb1e889cb39bae1b3e99248daea16
TreeHugger Robot [Mon, 16 Apr 2018 22:57:27 +0000 (22:57 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Amin Shaikh [Mon, 16 Apr 2018 22:56:25 +0000 (15:56 -0700)]
Merge "Dismiss low battery warning on toggling saver." into pi-dev
am:
223074533a
Change-Id: Iee5a691744504cab069502a012efa7baec310161
Dmitry Dementyev [Mon, 16 Apr 2018 22:50:16 +0000 (15:50 -0700)]
Merge "Remove implementation of deprecated RecoveryController methods." into pi-dev
am:
5291268754
Change-Id: Ic390d4b001ec63db78e5f8effc59a1c445153c6a
TreeHugger Robot [Mon, 16 Apr 2018 22:46:03 +0000 (22:46 +0000)]
Merge "Adds a code when statsd sends intent to getData." into pi-dev
Nan Zhang [Mon, 16 Apr 2018 22:45:05 +0000 (15:45 -0700)]
Merge "Migrate android.test.base.stubs generation to Soong."
am:
c263ce5e25
Change-Id: If7b1aafcee9be34385802315f4fd6ef71459e761
TreeHugger Robot [Mon, 16 Apr 2018 22:41:38 +0000 (22:41 +0000)]
Merge "Add A2DP set/get active device to greylist" into pi-dev
TreeHugger Robot [Mon, 16 Apr 2018 22:40:56 +0000 (22:40 +0000)]
Merge "Replace PackageInfo#signingCertificateHistory field doc reference." into pi-dev
Stanley Tng [Thu, 5 Apr 2018 01:33:46 +0000 (18:33 -0700)]
Cleanup documentation for LE CoC in BluetoothAdapter
Test: Compile
Bug:
77631591
Change-Id: Ic3c7f13e560534a048bf5c8b274fe62190c214c7
Julia Reynolds [Mon, 16 Apr 2018 22:33:02 +0000 (15:33 -0700)]
Merge "Remove streams from system_server" into pi-dev
am:
58a476920f
Change-Id: I691024ab57a37519694838bc7dd5faed9af99910
Tony Mak [Mon, 16 Apr 2018 22:27:19 +0000 (15:27 -0700)]
Merge "Fix instant app badge" into pi-dev
am:
c1dd5b0b30
Change-Id: I651808687a1a6275bab34a0c3398f0e089ea4ffe
TreeHugger Robot [Mon, 16 Apr 2018 22:19:45 +0000 (22:19 +0000)]
Merge "Dismiss low battery warning on toggling saver." into pi-dev
TreeHugger Robot [Mon, 16 Apr 2018 22:14:22 +0000 (22:14 +0000)]
Merge "Remove implementation of deprecated RecoveryController methods." into pi-dev
Rubin Xu [Mon, 16 Apr 2018 22:13:34 +0000 (15:13 -0700)]
Merge "Remove unnecessary disk access when loading synthetic password states" into pi-dev
am:
ece60739aa
Change-Id: Ic443dc0cb20282a89a274835375037689ab6d8f4
Julia Reynolds [Mon, 16 Apr 2018 22:13:07 +0000 (22:13 +0000)]
Merge "Remove streams from system_server" into pi-dev
TreeHugger Robot [Mon, 16 Apr 2018 22:08:33 +0000 (22:08 +0000)]
Merge "Fix instant app badge" into pi-dev
Pavlin Radoslavov [Mon, 16 Apr 2018 21:36:00 +0000 (14:36 -0700)]
Add A2DP set/get active device to greylist
Bug:
74238896
Bug:
78132844
Test: compile
Change-Id: If20ed03e6f579f06856e3e9cb6d4882313bfdc1b
Tej Singh [Wed, 11 Apr 2018 00:24:50 +0000 (17:24 -0700)]
Enforce dump permission in stats service
Enforces the dump permission in stats service and fixes a typo in an
enum name.
Bug: b/
77723108
Test: adb shell dumpsys stats as root and not root
Test: build success on marlin (and cts build success)
Change-Id: I131f97fe4fd370d50bc4ad369377f6adcca5f6ae
Rubin Xu [Mon, 16 Apr 2018 21:58:33 +0000 (21:58 +0000)]
Merge "Remove unnecessary disk access when loading synthetic password states" into pi-dev
Jeff Sharkey [Mon, 16 Apr 2018 21:51:17 +0000 (14:51 -0700)]
Merge "Use OS package name when identity cleared." into pi-dev
am:
6ac9a23f9b
Change-Id: Idff51642de785375c35f32b2bd60bc2fd80272d8
Dan Cashman [Mon, 16 Apr 2018 21:41:24 +0000 (14:41 -0700)]
Replace PackageInfo#signingCertificateHistory field doc reference.
During API review, PackageInfo#signingCertificateHistory was changed
to PackageInfo#signingInfo. This was not reflected everywhere in
the documentation. Update it.
Bug:
74831530
Test: Doc change only, builds.
Change-Id: I497cdd732dffacf376ac05f7ccd181004c947210
TreeHugger Robot [Mon, 16 Apr 2018 21:43:58 +0000 (21:43 +0000)]
Merge "Use OS package name when identity cleared." into pi-dev
Amin Shaikh [Mon, 16 Apr 2018 21:35:18 +0000 (14:35 -0700)]
Merge "Allow left-right swiping from edges in QS." into pi-dev
am:
28493adea6
Change-Id: I9aa7df4f0917816896eaddefdea76ee1208e4438
Julia Reynolds [Mon, 16 Apr 2018 21:29:36 +0000 (14:29 -0700)]
Merge "Always show or hide volume dialog" into pi-dev
am:
3c20a18e14
Change-Id: Id7fafcefdf9b9081c895237b3ed20c9bf6fefaec
Treehugger Robot [Mon, 16 Apr 2018 21:24:45 +0000 (21:24 +0000)]
Merge "Migrate android.test.base.stubs generation to Soong."
TreeHugger Robot [Mon, 16 Apr 2018 21:22:55 +0000 (21:22 +0000)]
Merge "Allow left-right swiping from edges in QS." into pi-dev
Jiuyu Sun [Mon, 16 Apr 2018 21:20:02 +0000 (14:20 -0700)]
Merge "Fix typos." into pi-dev
am:
2135c52b4d
Change-Id: I2f700355d8f4476a875e4b95df17e7441b0332b4
TreeHugger Robot [Mon, 16 Apr 2018 21:19:15 +0000 (21:19 +0000)]
Merge "Always show or hide volume dialog" into pi-dev
Dan Cashman [Mon, 16 Apr 2018 21:18:48 +0000 (14:18 -0700)]
InstantAppRegistry: adjust backwards compat cookie sig check.
InstantAppRegistry used to store cookies based on the hash of only
one of the signing certificates out of potentially multiple signing
certificates. To prevent loss of stored cookie info for an app which
has multiple signing certificates, it needs to check if the stored hash
value corresponded to only one of those certs before this was corrected.
Since the order of signing certificates is not specified, all cert hashes
should be compared to see if one of them matches the stored value.
Bug:
73739156
Test: android.appsecurity.cts.InstantCookieHostTest#testCookieValidWhenSingedWithTwoCerts
Change-Id: I2d616ca7ba60104f0b009d23e8eb4e7f525362fd
Bill Yi [Mon, 16 Apr 2018 20:59:51 +0000 (13:59 -0700)]
Merge changes from topic "am-
281eb700-c15a-44d3-a49f-
153f9323e62a" into oc-dev am:
231719b4d2 am:
60fb81edda am:
f84cc88320
am:
b95650a1ba
Change-Id: If6be4a98e37745157bed0dbb5f2f25785d43d294
Bill Yi [Mon, 16 Apr 2018 20:53:45 +0000 (13:53 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
c425155ab8 skipped:
b230479553 am:
fde5e09eeb -s ours am:
490f12c8c1 -s ours am:
0af21ab046 -s ours
am:
46eac73f6a -s ours
Change-Id: Iad505c39d07c4fd4025518f4bafdfbd494edf935
Hall Liu [Mon, 16 Apr 2018 20:51:53 +0000 (13:51 -0700)]
[automerger skipped] Merge "Move RTT system setting to Settings.Secure" am:
9a51f07117
am:
5f0cbc215d -s ours
Change-Id: Ibbae5f7cd07e12e4b6c52f9e260dfb8562cdf930
Jiuyu Sun [Mon, 16 Apr 2018 20:48:52 +0000 (20:48 +0000)]
Merge "Fix typos." into pi-dev
Bill Yi [Mon, 16 Apr 2018 20:47:20 +0000 (13:47 -0700)]
Merge changes from topic "am-
281eb700-c15a-44d3-a49f-
153f9323e62a" into oc-dev am:
231719b4d2 am:
60fb81edda
am:
f84cc88320
Change-Id: I6cd93c965df3aa652a1b669df2a88acd3a6c4e24
Bill Yi [Mon, 16 Apr 2018 20:43:42 +0000 (13:43 -0700)]
[automerger skipped] [automerger] Import translations. DO NOT MERGE am:
ba2da34cdf skipped:
9812374054 am:
bfcb8b99a5 -s ours am:
f62419973f -s ours am:
d9352518aa -s ours
am:
f227dadb99 -s ours
Change-Id: Ic929b21fc7b24fe65ea8364dfd0686c383bd3b57
Bill Yi [Mon, 16 Apr 2018 20:42:12 +0000 (13:42 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
c425155ab8 skipped:
b230479553 am:
fde5e09eeb -s ours am:
490f12c8c1 -s ours
am:
0af21ab046 -s ours
Change-Id: If9dff24f3fff2a9916d74874e2bc682b5a037c8d
Bill Yi [Mon, 16 Apr 2018 20:41:53 +0000 (13:41 -0700)]
[automerger skipped] [automerger] Import translations. DO NOT MERGE am:
aaf2bd3c6d skipped:
8383370425 am:
cb80417eab -s ours am:
3194fdd40a -s ours am:
923f65751a -s ours
am:
42cb72318b -s ours
Change-Id: Ic55365f484ace53aacb4dd76006d193c05591f21
Bill Yi [Mon, 16 Apr 2018 20:38:59 +0000 (13:38 -0700)]
[automerger skipped] [automerger] Import translations. DO NOT MERGE am:
c7fe3a5972 skipped:
9a64c59288 am:
67841fe1e6 -s ours am:
97ddc81da4 -s ours am:
3b3379f16a -s ours
am:
8d9df4b042 -s ours
Change-Id: I14f58ca53b0c9e94c34d727f7f20c13a8e255843
Bill Yi [Mon, 16 Apr 2018 20:35:40 +0000 (13:35 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
9b8bceedc2 skipped:
1789ac6b28 am:
d12aff917a -s ours am:
06e9f9dad5 -s ours am:
06ce4b2618 -s ours
am:
e2d8e005b2 -s ours
Change-Id: I4c7aa83b17d5e437616c4674fda27128852503b2
Philip P. Moltmann [Mon, 16 Apr 2018 20:33:49 +0000 (13:33 -0700)]
Merge changes from topic "ClearGrantIfGroupChanged-nyc" into oc-dev am:
6173fbe12e am:
6a845fe056 am:
1d9e95553b
am:
9aab64bd1c
Change-Id: Ie0c30d5ae70783f955e4a50a155f5c8c2c5f806e
Bill Yi [Mon, 16 Apr 2018 20:27:02 +0000 (13:27 -0700)]
[automerger skipped] [automerger] Import translations. DO NOT MERGE am:
ba2da34cdf skipped:
9812374054 am:
bfcb8b99a5 -s ours am:
f62419973f -s ours
am:
d9352518aa -s ours
Change-Id: Idc313d4c705d68edb65c057dfc5eb6e8e9efa80e
Bill Yi [Mon, 16 Apr 2018 20:24:55 +0000 (13:24 -0700)]
[automerger skipped] [automerger] Import translations. DO NOT MERGE am:
aaf2bd3c6d skipped:
8383370425 am:
cb80417eab -s ours am:
3194fdd40a -s ours
am:
923f65751a -s ours
Change-Id: I8b64a8fbbbcd92a6a949bcae98b44f37c0a4e09c
Bill Yi [Mon, 16 Apr 2018 20:23:17 +0000 (13:23 -0700)]
[automerger skipped] [automerger] Import translations. DO NOT MERGE am:
c7fe3a5972 skipped:
9a64c59288 am:
67841fe1e6 -s ours am:
97ddc81da4 -s ours
am:
3b3379f16a -s ours
Change-Id: I24f1dae0a8fc333cd2668f1085a81c1755a37707
Bill Yi [Mon, 16 Apr 2018 20:21:23 +0000 (13:21 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
9b8bceedc2 skipped:
1789ac6b28 am:
d12aff917a -s ours am:
06e9f9dad5 -s ours
am:
06ce4b2618 -s ours
Change-Id: I21bade1db7ee51f5ccbdd4afd08f3399c2e886e7
Philip P. Moltmann [Mon, 16 Apr 2018 20:19:04 +0000 (13:19 -0700)]
Merge changes from topic "ClearGrantIfGroupChanged-nyc" into oc-dev am:
6173fbe12e am:
6a845fe056
am:
1d9e95553b
Change-Id: Icb9e0c7261da6147d7d70be9f243fb387799c58f
Stanley Tng [Fri, 13 Apr 2018 21:54:10 +0000 (14:54 -0700)]
Clarify API doc for BluetoothGattServer::addService
Clarify that the caller has to wait for onServiceAdded callback before
calling BluetoothGattServer::addService again.
Bug:
72717069
Test: Compile
Change-Id: I20b031c724ba64bfd71cf10e58e587f69e4a2555
Hall Liu [Mon, 16 Apr 2018 20:08:16 +0000 (13:08 -0700)]
Merge "Move RTT system setting to Settings.Secure"
am:
9a51f07117
Change-Id: I226e9a91725f7755595c3530162829f8bf61b135
Philip P. Moltmann [Mon, 16 Apr 2018 20:06:05 +0000 (13:06 -0700)]
[automerger skipped] [automerger] DO NOT MERGE (M) Revoke permision when group changed am:
d87a1a7d53 am:
5630564178 am:
90cb8f7b6e skipped:
275e6bf1b4 am:
1bbc69d8f5 am:
8dbf706e9f am:
874fe98a8f am:
9b71a72cb0 skipped:
f1776f0805 am:
877a845005 am:
885bcab242 am:
c201aff50a -s ours
am:
b7af9ee423
Change-Id: I83d588b64dd04b95658dafe9028df8bf3cd0bc19
OSDN Git Service
