OSDN Git Service
Narayan Kamath [Fri, 8 Dec 2017 11:56:01 +0000 (11:56 +0000)]
Support WorkChains for WakeLock start / stop / change events.
Log WorkChains associated with a given WorkSource to statsd whenever
a wakelock is acquired / released or changes.
Test: WorkSourceTest, manual.
Bug:
62390666
Change-Id: I1720ba8b1778d38067398caac7cf92c4d375f816
TreeHugger Robot [Fri, 22 Dec 2017 13:32:15 +0000 (13:32 +0000)]
Merge changes I902b2816,I284d421e
* changes:
Add DISALLOW_AIRPLANE_MODE.
Add DISALLOW_CONFIG_LOCATION_MODE.
TreeHugger Robot [Fri, 22 Dec 2017 11:24:28 +0000 (11:24 +0000)]
Merge "Enforce platform level animation in CrossProfileApps.startMainActivity"
Andrew Scull [Fri, 22 Dec 2017 09:36:52 +0000 (09:36 +0000)]
Merge "DPMS: expose password blacklist API for SDK"
Dmitry Dementyev [Wed, 20 Dec 2017 20:38:36 +0000 (12:38 -0800)]
Implement API to store and retrieve recovery status.
Currently recovery agents can set/get statuses only for their own keys.
Bug:
66499222
Test: adb shell am instrument -w -e package \
com.android.server.locksettings.recoverablekeystore \
com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Change-Id: I5cb70ce139ca29c066d46d0bd4d2967bd3c30843
Dmitry Dementyev [Fri, 22 Dec 2017 01:30:48 +0000 (17:30 -0800)]
Implement RecoverableKeyStoreLoader.setSnapshotCreatedPendingIntent
Bug:
66499222
Test: adb shell am instrument -w -e package \
com.android.server.locksettings.recoverablekeystore \
com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Change-Id: I45905a2594ae5b4a681f15e78a7f63293c8fb4d5
Zhi An Ng [Fri, 22 Dec 2017 03:34:17 +0000 (03:34 +0000)]
Merge "Add default alarm back into AudioPackage"
TreeHugger Robot [Fri, 22 Dec 2017 02:18:30 +0000 (02:18 +0000)]
Merge "Add settings constants for battery tip"
TreeHugger Robot [Fri, 22 Dec 2017 02:18:08 +0000 (02:18 +0000)]
Merge "Switch to WebViewChromiumFactoryProviderForP"
TreeHugger Robot [Fri, 22 Dec 2017 01:49:30 +0000 (01:49 +0000)]
Merge "Implement recoverKeys"
Ying Xu [Fri, 22 Dec 2017 01:26:53 +0000 (01:26 +0000)]
Merge "Expose the scan API and network select API." am:
761b7b50d1 am:
a9083c3145
am:
3fc3857a73
Change-Id: I90d8d01ecedfa7993852041a7da811899f71cb64
Ying Xu [Fri, 22 Dec 2017 01:17:05 +0000 (01:17 +0000)]
Merge "Expose the scan API and network select API." am:
761b7b50d1
am:
a9083c3145
Change-Id: Iee5e44b4f6a9a8921a89c05640be4d52e0251bb8
Ying Xu [Fri, 22 Dec 2017 01:09:23 +0000 (01:09 +0000)]
Merge "Expose the scan API and network select API."
am:
761b7b50d1
Change-Id: I6cdbcea874ba58874dcfe47da9866b25643a1a96
TreeHugger Robot [Fri, 22 Dec 2017 01:07:05 +0000 (01:07 +0000)]
Merge "Always call start a new fill response when the user manually request autofill."
Ng Zhi An [Fri, 22 Dec 2017 01:02:02 +0000 (17:02 -0800)]
Add default alarm back into AudioPackage
Bug:
70788062
Test: open alarm clock and see default alarm
Change-Id: Ic2ca2638015e4bc114461c3b8b0f4fe7dd07c666
Hall Liu [Fri, 22 Dec 2017 01:01:50 +0000 (01:01 +0000)]
Merge "Add feature flag and EMBMS bug fixes" am:
465f2916e0 am:
3424136a59
am:
effcd1f508
Change-Id: Ibefdba1da5da4bfdf93d7db4c0f42a79ad75be46
Ying Xu [Fri, 22 Dec 2017 01:01:09 +0000 (01:01 +0000)]
Merge "Expose the scan API and network select API."
Hall Liu [Fri, 22 Dec 2017 00:54:14 +0000 (00:54 +0000)]
Merge "Add feature flag and EMBMS bug fixes" am:
465f2916e0
am:
3424136a59
Change-Id: Iebc092e58752f32b6abfad612901ae094e083449
Hall Liu [Fri, 22 Dec 2017 00:48:39 +0000 (00:48 +0000)]
Merge "Add feature flag and EMBMS bug fixes"
am:
465f2916e0
Change-Id: I0a590d86b2e39ba77a013ceb2c0d6b6582ef1ae4
Hall Liu [Fri, 22 Dec 2017 00:37:31 +0000 (00:37 +0000)]
Merge "Add feature flag and EMBMS bug fixes"
TreeHugger Robot [Fri, 22 Dec 2017 00:19:35 +0000 (00:19 +0000)]
Merge "Camera: pass stream/surface Id instead of Surface"
TreeHugger Robot [Fri, 22 Dec 2017 00:16:46 +0000 (00:16 +0000)]
Merge "Fixed a SystemUI crash"
Brad Ebinger [Fri, 22 Dec 2017 00:07:03 +0000 (00:07 +0000)]
Merge "Add new reason code for call barring" am:
a003d996b9 am:
ddf31e1810
am:
058a752502
Change-Id: I7758c971e63d442a6dd7e72cbec1f440f2aa7055
Robert Berry [Thu, 21 Dec 2017 12:41:01 +0000 (12:41 +0000)]
Implement recoverKeys
This implements all of recoverKeys, except for loading keys into the
AndroidKeyStore. Also omitting re-enrolling keys into the recoverable
store for now, as it is not clear whether the user will have a lock
screen set at this point. If they do not have a lock screen set, we
cannot re-enroll keys, as the platform-decrypt key is bound to the
lock screen. Also modifies SecureBox to throw AEADBadTagException for
any issues with the encrypted payload. IllegalArgumentException is
a runtime exception, so would be unexpected, but might occur if the
encrypted payload is for some reason garbage. Also, throw NPE if the
payload is null, as that is a programmer error - not something that
should ever occur at runtime.
Test: adb shell am instrument -w -e package com.android.server.locksettings.recoverablekeystore com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Change-Id: I4f0be412c3044f3472a6aed514f1caf54b7ee41f
Shimi Zhang [Fri, 15 Dec 2017 03:03:30 +0000 (19:03 -0800)]
Switch to WebViewChromiumFactoryProviderForP
Bug:
70688155
Test: Flash device to make sure WebView providers are in developer options.
Change-Id: I6fbaa0bd7769da4a83b42a378cb80cf3497294a2
jackqdyulei [Wed, 13 Dec 2017 23:01:43 +0000 (15:01 -0800)]
Add settings constants for battery tip
Bug:
70570352
Test: Build
Change-Id: I6639916b5b685d3ee64cfc2ea0771c1244e0e437
Brad Ebinger [Thu, 21 Dec 2017 23:59:45 +0000 (23:59 +0000)]
Merge "Add new reason code for call barring" am:
a003d996b9
am:
ddf31e1810
Change-Id: Ieb37e63f6843c21a40e366b08d8cf40b2f6d69d8
Brad Ebinger [Thu, 21 Dec 2017 23:53:13 +0000 (23:53 +0000)]
Merge "Add new reason code for call barring"
am:
a003d996b9
Change-Id: I36fd5803e1a1a535a000dc4e69dc7238fa26efbd
Robert Berry [Thu, 21 Dec 2017 23:45:36 +0000 (23:45 +0000)]
Merge "Add KeySyncTask"
Brad Ebinger [Thu, 21 Dec 2017 23:45:01 +0000 (23:45 +0000)]
Merge "Add new reason code for call barring"
Gil O'Neil [Thu, 21 Dec 2017 23:36:20 +0000 (23:36 +0000)]
Merge "Make TelephonyManager#{set/get}{Voice/Date}ActivationState SystemApis"
TreeHugger Robot [Thu, 21 Dec 2017 23:22:34 +0000 (23:22 +0000)]
Merge "Require that caller holds SEND_SMS and MODIFY_PHONES_STATE permissions"
Andrew Solovay [Thu, 21 Dec 2017 23:02:51 +0000 (23:02 +0000)]
Merge "DO NOT MERGE docs: Removing spurious end </pre> tag" into oc-mr1-dev am:
acc55e61dd
am:
4adbc6b5b0 -s ours
Change-Id: I7dcbba1052771fbfe6ef74c10b52a41941db1895
Jean-Michel Trivi [Thu, 21 Dec 2017 22:58:53 +0000 (22:58 +0000)]
Merge "AudioManager: add method to query stream attenuations in dB"
Hall Liu [Thu, 21 Dec 2017 22:56:27 +0000 (22:56 +0000)]
Merge "Add feature flag for RTT in call log" am:
138d07f82d am:
9a5e663d97
am:
51c68e6570
Change-Id: I44de419a5b170d6fd5b1d26f4291eb3750b11c59
Andrew Solovay [Thu, 21 Dec 2017 22:55:33 +0000 (22:55 +0000)]
Merge "DO NOT MERGE docs: Removing spurious end </pre> tag" into oc-mr1-dev
am:
acc55e61dd
Change-Id: I35d0f71a7da2dcae3ed3bab4aa111290ea4c4c60
Hall Liu [Thu, 21 Dec 2017 22:47:29 +0000 (22:47 +0000)]
Merge "Add feature flag for RTT in call log" am:
138d07f82d
am:
9a5e663d97
Change-Id: Ibdf102659e079844e81faac327b0d9cfb3b0d9de
Felipe Leme [Thu, 21 Dec 2017 22:43:19 +0000 (14:43 -0800)]
Always call start a new fill response when the user manually request autofill.
Test: atest CtsAutoFillServiceTestCases:LoginActivityTest#testAutofillManuallyAlwaysCallServiceAgain
Test: atest CtsAutoFillServiceTestCases
Fixes:
69318180
Change-Id: I67f63f57f249bb109ca764bd2d0911ad6f5c4065
Android Build Merger (Role) [Thu, 21 Dec 2017 22:43:36 +0000 (22:43 +0000)]
Merge "Merge "BluetoothHidDevice: rename onIntrData to onInterruptData (1/5)" am:
045fdae1b3 am:
d6c2722094 am:
f3caa4dc5a -s ours"
Hansong Zhang [Thu, 21 Dec 2017 22:41:34 +0000 (22:41 +0000)]
Merge "BluetoothHidDevice: rename onIntrData to onInterruptData (1/5)" am:
045fdae1b3 am:
d6c2722094
am:
f3caa4dc5a -s ours
Change-Id: I0e57ed1b1d48339ce841eb9bd193ded71e48e053
TreeHugger Robot [Thu, 21 Dec 2017 22:41:33 +0000 (22:41 +0000)]
Merge "Modify system properties proto"
TreeHugger Robot [Thu, 21 Dec 2017 22:41:15 +0000 (22:41 +0000)]
Merge "DO NOT MERGE docs: Removing spurious end </pre> tag" into oc-mr1-dev
Hall Liu [Thu, 21 Dec 2017 22:40:11 +0000 (22:40 +0000)]
Merge "Add feature flag for RTT in call log"
am:
138d07f82d
Change-Id: Id04b93ecd8cd25f59354fe209cb98c05248afaa8
TreeHugger Robot [Thu, 21 Dec 2017 22:36:44 +0000 (22:36 +0000)]
Merge "Always synchronize the OemUnlockAllowed bit to the FRP partition"
Hansong Zhang [Thu, 21 Dec 2017 22:31:53 +0000 (22:31 +0000)]
Merge "BluetoothHidDevice: rename onIntrData to onInterruptData (1/5)" am:
045fdae1b3
am:
d6c2722094
Change-Id: I7ef265d36f4a42e7e9a74e63e8b343b28b63c8b3
Hall Liu [Thu, 21 Dec 2017 22:31:45 +0000 (22:31 +0000)]
Merge "Add feature flag for RTT in call log"
Selim Cinek [Thu, 21 Dec 2017 19:33:26 +0000 (11:33 -0800)]
Fixed a SystemUI crash
The iconState can be null. We're now logging
if it happen to get some additional information,
but the crash should be avoided.
Test: add notifications
Change-Id: I134743ef56a45e8b72a1603a2622350245885f4b
Fixes:
70694861
Hansong Zhang [Thu, 21 Dec 2017 22:08:20 +0000 (22:08 +0000)]
Merge "BluetoothHidDevice: rename onIntrData to onInterruptData (1/5)"
am:
045fdae1b3
Change-Id: I8f7a28ce56435bd4d1f01631b188a62f35c3f100
TreeHugger Robot [Thu, 21 Dec 2017 22:07:15 +0000 (22:07 +0000)]
Merge "Workaround apps that are doing very very bad things"
Oscar Shu [Thu, 21 Dec 2017 22:05:44 +0000 (22:05 +0000)]
Merge "WifiManager API documentation update"
TreeHugger Robot [Thu, 21 Dec 2017 22:00:31 +0000 (22:00 +0000)]
Merge "Import translations. DO NOT MERGE"
Treehugger Robot [Thu, 21 Dec 2017 21:56:10 +0000 (21:56 +0000)]
Merge "BluetoothHidDevice: rename onIntrData to onInterruptData (1/5)"
yuemingw [Wed, 29 Nov 2017 15:52:56 +0000 (15:52 +0000)]
Add DISALLOW_AIRPLANE_MODE.
Bug:
67675441
Test: cts test will be added for b/
67675455
Design doc: https://docs.google.com/document/d/1rvEg5jE3lMhjH-OA0iTLBUY2opM96fg7BrP81MoPnmg/edit#
Change-Id: I902b281695a7e734639c9d6d4852a0e96fea8305
yuemingw [Tue, 28 Nov 2017 17:20:01 +0000 (17:20 +0000)]
Add DISALLOW_CONFIG_LOCATION_MODE.
Bug:
67674888
Test: cts test will be added in b/
67674901
Design doc: https://docs.google.com/document/d/1rvEg5jE3lMhjH-OA0iTLBUY2opM96fg7BrP81MoPnmg/edit#
Change-Id: I284d421eedfb238084fa61e7661638c22b28734f
Holly Jiuyu Sun [Thu, 21 Dec 2017 21:38:00 +0000 (21:38 +0000)]
Merge "Add asn1 to platform." am:
bdd0da8fa7 am:
ea1d85d484
am:
a44b3e3d12 -s ours
Change-Id: I7ae27f189174885f2e7c528c87a04aefc925c47a
Holly Jiuyu Sun [Thu, 21 Dec 2017 21:29:24 +0000 (21:29 +0000)]
Merge "Add asn1 to platform." am:
bdd0da8fa7
am:
ea1d85d484
Change-Id: Ib2968038bcacdc81e2249dc5e3a40f25ceb191b7
Bill Yi [Thu, 21 Dec 2017 21:22:14 +0000 (21:22 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am:
c0745b94c2 -s ours
am:
f49bf087ba -s ours
Change-Id: Id61b4a2da9551c8c084d7b5e71333105cbdfb225
Holly Jiuyu Sun [Thu, 21 Dec 2017 21:19:28 +0000 (21:19 +0000)]
Merge "Add asn1 to platform."
am:
bdd0da8fa7
Change-Id: Ic34f9bd45e7fb46bae2afe5be0cc453d87b276bd
Bill Yi [Thu, 21 Dec 2017 21:17:15 +0000 (21:17 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
c0745b94c2 -s ours
Change-Id: Ia1425c1a21585764700000bf98fb25d3346bd639
TreeHugger Robot [Thu, 21 Dec 2017 21:08:50 +0000 (21:08 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Holly Jiuyu Sun [Thu, 21 Dec 2017 21:01:40 +0000 (21:01 +0000)]
Merge "Add asn1 to platform."
Yi Jin [Thu, 21 Dec 2017 18:35:34 +0000 (10:35 -0800)]
Modify system properties proto
Test: atest incident_helper_test
Change-Id: Id81922e7f4412090e3b72b3a0fc1151995635885
goneil [Thu, 14 Dec 2017 00:20:35 +0000 (16:20 -0800)]
Require that caller holds SEND_SMS and MODIFY_PHONES_STATE permissions
Bug:
70177947
Test: None
Change-Id: If26ae0c69d3266c2639b61b3ed32df3f1cb2c36f
Tyler Gunn [Thu, 21 Dec 2017 20:43:39 +0000 (20:43 +0000)]
Merge "Add logging and disconnect reason for null connections." am:
7661e81f85 am:
c840efcf7e
am:
5d7c823e16
Change-Id: I57395d052d284ca3b8071b71dc762c1147d1107a
Bill Yi [Thu, 21 Dec 2017 20:39:18 +0000 (20:39 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
45d962274f -s ours am:
0a1948e515 -s ours am:
7cb6513f6d -s ours am:
f0687d1201 -s ours am:
9c166446fd -s ours
am:
a1834cfc3f -s ours
Change-Id: Ia65be7aaf7fdf86151eb0ace6e2cb3400a0b73c2
Bill Yi [Thu, 21 Dec 2017 20:37:45 +0000 (20:37 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
81b98ffb09 -s ours am:
ea2e302eff -s ours am:
b6dab6b3ee -s ours am:
1f9ae3b912 -s ours am:
66acdceb9b -s ours
am:
97ae42b0d6 -s ours
Change-Id: Iab46453d06f635518df8ada21c74afb82f6e4a65
Bill Yi [Thu, 21 Dec 2017 20:36:24 +0000 (20:36 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
599fb37c01 -s ours am:
d21211470c -s ours am:
f1c75d66ec -s ours am:
b7a560fb10 -s ours am:
5af20c1c28 -s ours
am:
1598332a7f -s ours
Change-Id: Id3efdeb1929c635d8536125776d17ea2bdb72690
Bill Yi [Thu, 21 Dec 2017 20:34:39 +0000 (20:34 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
e1ca34b5c7 -s ours am:
d5a7faea83 -s ours am:
bd14c44fd8 -s ours am:
f6c335b353 -s ours am:
f24783846d -s ours
am:
29f70cb6fb -s ours
Change-Id: I3b1f978abd9a3f0511af1df8735f873695e01997
Bill Yi [Thu, 21 Dec 2017 20:33:26 +0000 (20:33 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
7ce772e941 -s ours am:
51fc07ad61 -s ours am:
c344f9b1c7 -s ours am:
39d480e67c -s ours am:
59f4b0c11f -s ours
am:
6ba039da20 -s ours
Change-Id: I6d3cfb032e8402a6458b83213739fbf11ee78f0d
Bill Yi [Thu, 21 Dec 2017 20:31:52 +0000 (20:31 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
1f204cd1ea -s ours am:
5943ef281a -s ours am:
2c97ca3b62 -s ours am:
934729c535 -s ours am:
37e0c23902 -s ours
am:
b4db20359a -s ours
Change-Id: I543fbce177f9dc7cbc2448f08e00780e801aff2d
Bill Yi [Thu, 21 Dec 2017 20:30:35 +0000 (20:30 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
970261b46c -s ours am:
a683975c54 -s ours am:
0bfcd7eef7 -s ours am:
f123f221db -s ours am:
95b4c706b8 -s ours
am:
5dd6a1c735 -s ours
Change-Id: I9c7854ba3ff5cac3da1e39e7fe48ba0b27a06e4a
Bill Yi [Thu, 21 Dec 2017 20:28:58 +0000 (20:28 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
9593ca1955 -s ours am:
7244723549 -s ours am:
05e41d0531 -s ours am:
7baaa51e62 -s ours am:
a963a02442 -s ours
am:
dfa5f5d102 -s ours
Change-Id: I14296ee29df5b968168c0e9815f96cb88972bd0a
Bill Yi [Thu, 21 Dec 2017 20:27:51 +0000 (20:27 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
0c1f4c2931 -s ours am:
2d00ab621a -s ours am:
e135a35edf -s ours am:
301dfae698 -s ours am:
5f38be9fdb -s ours
am:
6868ade468 -s ours
Change-Id: I91ee1333af3dfb29d70d5929a228c91edd9ce10d
Bill Yi [Thu, 21 Dec 2017 20:26:17 +0000 (20:26 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
496af8623f -s ours am:
c81e5ae281 -s ours am:
13062c93e5 -s ours am:
25d7b576ec -s ours am:
50f7d64f05 -s ours
am:
833ba96cba -s ours
Change-Id: I38b2c9a6f75f6d38ca4e79dc204b2603de633ce1
Android Build Merger (Role) [Thu, 21 Dec 2017 20:10:29 +0000 (20:10 +0000)]
Merge "Merge "SMS over IMS APIs revision" am:
2bf7f03e63 am:
f9eba1a18f am:
ca88d359c0"
abdalkader [Thu, 21 Dec 2017 20:10:03 +0000 (20:10 +0000)]
Merge "SMS over IMS APIs revision" am:
2bf7f03e63 am:
f9eba1a18f
am:
ca88d359c0
Change-Id: Iea7624e10230294505982f0373b97a2486d6996f
Tyler Gunn [Thu, 21 Dec 2017 20:06:18 +0000 (20:06 +0000)]
Merge "Add logging and disconnect reason for null connections." am:
7661e81f85
am:
c840efcf7e
Change-Id: I5038667db6b15d74aada29e245b8ff81ca2f3bd8
Android Build Merger (Role) [Thu, 21 Dec 2017 20:06:07 +0000 (20:06 +0000)]
Merge "Merge "Add Notification Flag behavior test" am:
89bb1971d0 am:
dee5f9a738 am:
a33e1dd26f -s ours"
Yan Sun [Thu, 21 Dec 2017 20:05:39 +0000 (20:05 +0000)]
Merge "Add Notification Flag behavior test" am:
89bb1971d0 am:
dee5f9a738
am:
a33e1dd26f -s ours
Change-Id: I98caf6c319a21ebd5f85c1c740691ddcd31894ba
Android Build Merger (Role) [Thu, 21 Dec 2017 20:01:19 +0000 (20:01 +0000)]
Merge "Merge "Fix random systemui crashes during cts test DO NOT MERGE" am:
d8514e82aa -s ours am:
e9940be86d am:
cb9ded1d30 -s ours"
Chrison.chai [Thu, 21 Dec 2017 20:00:54 +0000 (20:00 +0000)]
Merge "Fix random systemui crashes during cts test DO NOT MERGE" am:
d8514e82aa -s ours am:
e9940be86d
am:
cb9ded1d30 -s ours
Change-Id: I879999d0033e242d02c50bf6ea4a2c40a433a871
Tyler Gunn [Thu, 21 Dec 2017 20:00:28 +0000 (20:00 +0000)]
Merge "Add logging and disconnect reason for null connections."
am:
7661e81f85
Change-Id: Id1f754f62869c38499f30d6ee33046c89024efc6
Android Build Merger (Role) [Thu, 21 Dec 2017 19:59:57 +0000 (19:59 +0000)]
Merge "Merge "Testables lib should not statically link mockito" am:
47d04fc5c0 am:
b42cd23425 am:
0a6f66e9a9 -s ours"
Bill Yi [Thu, 21 Dec 2017 19:59:54 +0000 (19:59 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
45d962274f -s ours am:
0a1948e515 -s ours am:
7cb6513f6d -s ours am:
f0687d1201 -s ours
am:
9c166446fd -s ours
Change-Id: Ide4d30d971d02840f7f70733e15e5083ecbca5ea
Philip P. Moltmann [Thu, 21 Dec 2017 19:59:29 +0000 (19:59 +0000)]
Merge "Testables lib should not statically link mockito" am:
47d04fc5c0 am:
b42cd23425
am:
0a6f66e9a9 -s ours
Change-Id: I86a59fd6006a3ba59b237044c61ab1d5c2a61333
Bill Yi [Thu, 21 Dec 2017 19:58:39 +0000 (19:58 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
81b98ffb09 -s ours am:
ea2e302eff -s ours am:
b6dab6b3ee -s ours am:
1f9ae3b912 -s ours
am:
66acdceb9b -s ours
Change-Id: I64312d2118512439ba4c4c7746d2c3550a525295
Bill Yi [Thu, 21 Dec 2017 19:56:02 +0000 (19:56 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
599fb37c01 -s ours am:
d21211470c -s ours am:
f1c75d66ec -s ours am:
b7a560fb10 -s ours
am:
5af20c1c28 -s ours
Change-Id: I8d98d9728d058add17b64172221733bedb07b4f3
Android Build Merger (Role) [Thu, 21 Dec 2017 19:54:55 +0000 (19:54 +0000)]
Merge "Merge "Receiving side Call handover API implementation." am:
3c7bc2dc06 am:
151c15445a am:
c65e740f98 -s ours"
Bill Yi [Thu, 21 Dec 2017 19:54:14 +0000 (19:54 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
e1ca34b5c7 -s ours am:
d5a7faea83 -s ours am:
bd14c44fd8 -s ours am:
f6c335b353 -s ours
am:
f24783846d -s ours
Change-Id: I47bd5497b0ac5ef061975b4ef7aed22cb016d2db
Sanket Padawe [Thu, 21 Dec 2017 19:54:03 +0000 (19:54 +0000)]
Merge "Receiving side Call handover API implementation." am:
3c7bc2dc06 am:
151c15445a
am:
c65e740f98 -s ours
Change-Id: I457622e41c15891142a51140b083d1d6b465e10e
Siddharth Ray [Thu, 21 Dec 2017 19:53:54 +0000 (19:53 +0000)]
Merge "Obtain cellular related battery statistics"
Bill Yi [Thu, 21 Dec 2017 19:52:47 +0000 (19:52 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
7ce772e941 -s ours am:
51fc07ad61 -s ours am:
c344f9b1c7 -s ours am:
39d480e67c -s ours
am:
59f4b0c11f -s ours
Change-Id: I6c0cbf7c26fc7f2b010126e5aa7ceb444aa71ab3
Bill Yi [Thu, 21 Dec 2017 19:51:02 +0000 (19:51 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
1f204cd1ea -s ours am:
5943ef281a -s ours am:
2c97ca3b62 -s ours am:
934729c535 -s ours
am:
37e0c23902 -s ours
Change-Id: I2e96d32fcbb128a84828172f17b45db12ee790fd
Bill Yi [Thu, 21 Dec 2017 19:49:35 +0000 (19:49 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
970261b46c -s ours am:
a683975c54 -s ours am:
0bfcd7eef7 -s ours am:
f123f221db -s ours
am:
95b4c706b8 -s ours
Change-Id: Ia66e2c284c14aa911c92f49150ce9b8ee6c345e8
Chenbo Feng [Thu, 21 Dec 2017 19:49:25 +0000 (19:49 +0000)]
Merge "Use NetworkStatsService to get stats for apps" am:
693d8a2ab1 am:
fa7f4015fc
am:
09a81e4da1
Change-Id: I90ce68a72afbf596e28d987e925795709d24dd52
Bill Yi [Thu, 21 Dec 2017 19:47:45 +0000 (19:47 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
9593ca1955 -s ours am:
7244723549 -s ours am:
05e41d0531 -s ours am:
7baaa51e62 -s ours
am:
a963a02442 -s ours
Change-Id: Ife6d85d42f5f0beffdaf5da0c031e79d74d3c8d9
Bill Yi [Thu, 21 Dec 2017 19:46:22 +0000 (19:46 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
0c1f4c2931 -s ours am:
2d00ab621a -s ours am:
e135a35edf -s ours am:
301dfae698 -s ours
am:
5f38be9fdb -s ours
Change-Id: I835ba14d3bed4c5ebf901d60a2603c6692135b4e
TreeHugger Robot [Thu, 21 Dec 2017 19:44:38 +0000 (19:44 +0000)]
Merge "Move ServiceListing to SettingsLib and add tests"
Bill Yi [Thu, 21 Dec 2017 19:44:05 +0000 (19:44 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
496af8623f -s ours am:
c81e5ae281 -s ours am:
13062c93e5 -s ours am:
25d7b576ec -s ours
am:
50f7d64f05 -s ours
Change-Id: Ie2458ad57d6b64678243429e257e0701edd357a5
abdalkader [Thu, 21 Dec 2017 19:40:25 +0000 (19:40 +0000)]
Merge "SMS over IMS APIs revision" am:
2bf7f03e63
am:
f9eba1a18f
Change-Id: Ia7bdaeee0ca3942d72d9e92faa78a947fe1d4616
OSDN Git Service
