OSDN Git Service
Andrii Kulian [Mon, 2 Apr 2018 22:58:26 +0000 (22:58 +0000)]
Merge "Don't finish activity on duplicate resume request" into pi-dev
am:
38af02e75b
Change-Id: I8d7d56c9b6d7b1e987379ae26e883a8e1deb2ecf
Sudheer Shanka [Mon, 2 Apr 2018 22:53:08 +0000 (22:53 +0000)]
Merge "Update uid state used for bucketizing data in fg vs bg states." into pi-dev
am:
8303baf4d0
Change-Id: Ia476818fee03347c5d0bf80d3197ef391b9f7c66
Todd Kennedy [Mon, 2 Apr 2018 21:59:09 +0000 (21:59 +0000)]
Merge "Use per user info for seinfo" into pi-dev
am:
ce5f2b3e87
Change-Id: I01dbd963e683fac472a58d6610fde40dc6fb79f2
Mike Digman [Mon, 2 Apr 2018 21:51:29 +0000 (21:51 +0000)]
Merge "Fix right-most navbar icon tinting mismatch" into pi-dev
am:
78e805684b
Change-Id: I2d038a72bd421832bd242b49e76eda9c16eb0285
Pavel Maltsev [Mon, 2 Apr 2018 21:47:22 +0000 (21:47 +0000)]
Merge "Make addUnwantedCapability method public" into pi-dev
am:
7f5670fdcd
Change-Id: I6d1676b72f125baf5b72e8718bd331a30b3c3c30
Erik Kline [Mon, 2 Apr 2018 21:08:52 +0000 (21:08 +0000)]
Merge "Refactor isTetheringSupported() calls" am:
e34c426fd3
am:
6f63d051d6
Change-Id: Iad6358dc2f1d10b322d22ec90543adc50882962d
Erik Kline [Mon, 2 Apr 2018 20:57:43 +0000 (20:57 +0000)]
Merge "Refactor isTetheringSupported() calls"
am:
e34c426fd3
Change-Id: Iecc4e563f151545facc23f4a24a8dbf2d6ab9822
Android Build Merger (Role) [Mon, 2 Apr 2018 20:27:43 +0000 (20:27 +0000)]
Merge "Merge "Restore saveLayer APIs back into the public API." into pi-dev am:
ffe1c2a266" into pi-dev-plus-aosp
Derek Sollenberger [Mon, 2 Apr 2018 20:26:38 +0000 (20:26 +0000)]
Merge "Restore saveLayer APIs back into the public API." into pi-dev
am:
ffe1c2a266
Change-Id: I4dc9a7272aeeda9ae6be5ce9215cc2a4939286fa
Android Build Merger (Role) [Mon, 2 Apr 2018 20:20:05 +0000 (20:20 +0000)]
Merge "Merge "Calculate multipath quota excluding current day." into pi-dev am:
07daad2dbf" into pi-dev-plus-aosp
Remi NGUYEN VAN [Mon, 2 Apr 2018 20:19:22 +0000 (20:19 +0000)]
Merge "Calculate multipath quota excluding current day." into pi-dev
am:
07daad2dbf
Change-Id: I8fc1a2c491f4518ee835a197a0f5f0cd7ba23543
Android Build Merger (Role) [Mon, 2 Apr 2018 20:15:03 +0000 (20:15 +0000)]
Merge "Merge "Fix PermissionMonitorTest that has been failing." into pi-dev am:
6e66280d35" into pi-dev-plus-aosp
Chalard Jean [Mon, 2 Apr 2018 20:14:29 +0000 (20:14 +0000)]
Merge "Fix PermissionMonitorTest that has been failing." into pi-dev
am:
6e66280d35
Change-Id: Ifb04fdda2b54b0bde8b6eeead3e0240d5cc1ff79
Android Build Merger (Role) [Mon, 2 Apr 2018 20:10:17 +0000 (20:10 +0000)]
Merge "Merge "TextClassifier API updates." into pi-dev am:
bf9dfb16be" into pi-dev-plus-aosp
Xiangyu/Malcolm Chen [Mon, 2 Apr 2018 20:05:00 +0000 (20:05 +0000)]
[automerger skipped] Merge "Adding debug message inside NetworkServiceCallback." am:
9bbfe5c14c
am:
cc1bf181d0 -s ours
Change-Id: Ica090f421ddbf4672f68bdbf77839a8e931638cf
Abodunrinwa Toki [Mon, 2 Apr 2018 20:03:04 +0000 (20:03 +0000)]
Merge "TextClassifier API updates." into pi-dev
am:
bf9dfb16be
Change-Id: I11d37c920abb4aa1fbd5022f30a10fdbe8efe997
Xiangyu/Malcolm Chen [Mon, 2 Apr 2018 19:54:57 +0000 (19:54 +0000)]
Merge "Adding debug message inside NetworkServiceCallback."
am:
9bbfe5c14c
Change-Id: Ida0d753a46f7aef9f0596d414edab8d36ea24b82
Bernie Innocenti [Mon, 2 Apr 2018 19:51:19 +0000 (19:51 +0000)]
Merge "apf: adjust JNI to accept_packet()'s new signature" into pi-dev
am:
4a3ccc18e6
Change-Id: I62c4c90283ab9a989db084e8d19582010f66bcee
Remi NGUYEN VAN [Mon, 2 Apr 2018 19:43:54 +0000 (19:43 +0000)]
[automerger skipped] Merge "Add method to NetworkStatsService for UID stats." into pi-dev
am:
6f5a8db2e9 -s ours
Change-Id: I4182b2dfad1f40dd29da8c3612cf0dbc4038aa7b
Remi NGUYEN VAN [Mon, 2 Apr 2018 19:41:12 +0000 (19:41 +0000)]
Merge "Differentiate depleted and unset multipath quota" into pi-dev
am:
dfa8f0dbce
Change-Id: Ifb99a545b972b80ac5c0edf01e10b36e06ac06c5
Bill Yi [Mon, 2 Apr 2018 19:36:17 +0000 (19:36 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
e970444839 -s ours
Change-Id: Ia07b2d0ddf15dc1600bcf890ccb36e6cf26e8060
Bill Yi [Mon, 2 Apr 2018 19:35:42 +0000 (19:35 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
ae73c8bea6 -s ours
Change-Id: I2af4ff532f7f72de181464ff43ec6dbc355896aa
Seigo Nonaka [Mon, 2 Apr 2018 19:31:33 +0000 (19:31 +0000)]
Merge "Fills font metrics before passing to ReplacementSpan" into pi-dev
am:
138148425c
Change-Id: I25a8114a246c7c0a244e2ee69f9efd58b5dbd6f9
Bill Yi [Mon, 2 Apr 2018 19:27:00 +0000 (19:27 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
299491afe1 -s ours
Change-Id: I08cce5c324d11d7cdbd9935a83593edada6d57c3
Bill Yi [Mon, 2 Apr 2018 19:26:22 +0000 (19:26 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
aaa2849890 -s ours
Change-Id: I6fbc173e9e9007dfd471b14edf806ba882f4e16a
Bo Zhu [Mon, 2 Apr 2018 19:25:47 +0000 (19:25 +0000)]
Merge "Skip the cert xml serial number check if the test root cert is in use" into pi-dev
am:
3cd574ced9
Change-Id: I01e101f36dba43b062bb3134ed171e1eff358d24
Bill Yi [Mon, 2 Apr 2018 19:21:53 +0000 (19:21 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
85e4a97789 -s ours
Change-Id: I97dd7864f151d03d6fa048720a039b81f84145a2
Bill Yi [Mon, 2 Apr 2018 19:21:22 +0000 (19:21 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
879127f31d -s ours
Change-Id: Idf4d54fcb3cab7feb32a9061978f5d5b4e671609
Bill Yi [Mon, 2 Apr 2018 19:20:54 +0000 (19:20 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
f03441f47f -s ours
Change-Id: I0397dce3962f676f180b499853faf64a8dabcb51
Daichi Hirono [Mon, 2 Apr 2018 19:20:24 +0000 (19:20 +0000)]
Merge "Add config flag to specify if wallpaper is rendered" into pi-dev
am:
c0f8eb345a
Change-Id: Icc3778801aad786bc9cd2ee01be93c70b9158c82
Bill Yi [Mon, 2 Apr 2018 19:15:44 +0000 (19:15 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
da6cff4e08 -s ours
Change-Id: I45d54de12a471a850a63e520899e6265d9a413a4
Dianne Hackborn [Mon, 2 Apr 2018 19:09:08 +0000 (19:09 +0000)]
Merge "Fix issue #
77230164: Add app op to control foreground services" into pi-dev
am:
21306849e6
Change-Id: Ia999a20e8f0959876f9cb05d121982cc2c1f0890
Mihai Popa [Mon, 2 Apr 2018 19:01:09 +0000 (19:01 +0000)]
Merge "[Magnifier-36] Fix content clamping inside view" into pi-dev
am:
4ab18af48a
Change-Id: I01333effc684267875cec696fab175b01304ef43
Treehugger Robot [Mon, 2 Apr 2018 18:47:18 +0000 (18:47 +0000)]
Merge "Refactor isTetheringSupported() calls"
Android Build Merger (Role) [Mon, 2 Apr 2018 18:46:40 +0000 (18:46 +0000)]
Merge "Merge "Don't allow using raw public keys to init recovery service any more" into pi-dev am:
b152a8c45d" into pi-dev-plus-aosp
Bo Zhu [Mon, 2 Apr 2018 18:46:18 +0000 (18:46 +0000)]
Merge "Don't allow using raw public keys to init recovery service any more" into pi-dev
am:
b152a8c45d
Change-Id: Ic23e7b2e675ac0f4b2b6e306a5b8605eab4a330c
Xiangyu/Malcolm Chen [Mon, 2 Apr 2018 18:43:01 +0000 (18:43 +0000)]
Merge "Adding debug message inside NetworkServiceCallback."
Android Build Merger (Role) [Mon, 2 Apr 2018 18:41:53 +0000 (18:41 +0000)]
Merge "Merge "Throw invalid cert exception when deprecated initRecoveryService method is used." into pi-dev am:
bf08774704" into pi-dev-plus-aosp
Dmitry Dementyev [Mon, 2 Apr 2018 18:41:30 +0000 (18:41 +0000)]
Merge "Throw invalid cert exception when deprecated initRecoveryService method is used." into pi-dev
am:
bf08774704
Change-Id: Iee0b88661e5bbe67f6dcb7aa2027d0e5b123eef3
Android Build Merger (Role) [Mon, 2 Apr 2018 18:37:32 +0000 (18:37 +0000)]
Merge "Merge "Throw an exception if the given root alias is unknown" into pi-dev am:
49eb4c1f1f" into pi-dev-plus-aosp
Bo Zhu [Mon, 2 Apr 2018 18:37:04 +0000 (18:37 +0000)]
Merge "Throw an exception if the given root alias is unknown" into pi-dev
am:
49eb4c1f1f
Change-Id: I929c1ce5c10359a188ba2354697eda5cb8c17b08
Android Build Merger (Role) [Mon, 2 Apr 2018 18:33:07 +0000 (18:33 +0000)]
Merge "Merge "Slice row redlines and animations" into pi-dev am:
9009654c1d" into pi-dev-plus-aosp
Lucas Dupin [Mon, 2 Apr 2018 18:32:37 +0000 (18:32 +0000)]
Merge "Slice row redlines and animations" into pi-dev
am:
9009654c1d
Change-Id: Id420d3c839a440d395212e30c26c67a7b79488fa
Android Build Merger (Role) [Mon, 2 Apr 2018 18:28:41 +0000 (18:28 +0000)]
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
07a75e0f9f -s ours" into pi-dev-plus-aosp
Bill Yi [Mon, 2 Apr 2018 18:28:15 +0000 (18:28 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
07a75e0f9f -s ours
Change-Id: I29c5bed425329d789b1bef6efb147e6bcbd4ad7b
Android Build Merger (Role) [Mon, 2 Apr 2018 18:28:07 +0000 (18:28 +0000)]
Merge "Merge "Change Locate to Map for address selections" into pi-dev am:
03061a7903" into pi-dev-plus-aosp
Jan Althaus [Mon, 2 Apr 2018 18:27:44 +0000 (18:27 +0000)]
Merge "Change Locate to Map for address selections" into pi-dev
am:
03061a7903
Change-Id: I9ce3068cc2c8b09a73b6ac1f1a9b5585c767f316
Android Build Merger (Role) [Mon, 2 Apr 2018 18:23:56 +0000 (18:23 +0000)]
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
38dccc3fff -s ours" into pi-dev-plus-aosp
Bill Yi [Mon, 2 Apr 2018 18:23:35 +0000 (18:23 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
38dccc3fff -s ours
Change-Id: I9239d12a182a41dcb5db4a33f2b8fdac5aef5763
Android Build Merger (Role) [Mon, 2 Apr 2018 18:23:28 +0000 (18:23 +0000)]
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
46b20b4e18 -s ours" into pi-dev-plus-aosp
Android Build Merger (Role) [Mon, 2 Apr 2018 18:23:18 +0000 (18:23 +0000)]
Merge "Merge "APF: drop multicast ICMPv6 while in doze mode" am:
7880e284c8 am:
f0ddd72f0f" into pi-dev-plus-aosp
Bill Yi [Mon, 2 Apr 2018 18:22:53 +0000 (18:22 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
46b20b4e18 -s ours
Change-Id: Iff28e2792dafb0ed15eb975c0ac0bc2c3599ba15
Bernie Innocenti [Mon, 2 Apr 2018 18:22:47 +0000 (18:22 +0000)]
Merge "APF: drop multicast ICMPv6 while in doze mode" am:
7880e284c8
am:
f0ddd72f0f
Change-Id: I2827fc9159fe8d372d881451b9971ddcc4a0530f
Bill Yi [Mon, 2 Apr 2018 18:22:24 +0000 (18:22 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
292a890081 -s ours
Change-Id: Ifa5849d408d523391ddbb7fdd73b30b87c75f168
Bill Yi [Mon, 2 Apr 2018 18:20:16 +0000 (18:20 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
5080670104 -s ours
Change-Id: I39a96d32716dc9a19c388ee3bced8ce69d4c9980
Bill Yi [Mon, 2 Apr 2018 18:19:36 +0000 (18:19 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
89af056de6 -s ours
Change-Id: I567c278d8ef71c51aa49efc9164ff9023c0a7d4a
Bill Yi [Mon, 2 Apr 2018 18:18:53 +0000 (18:18 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
86fdaf1a6b -s ours
Change-Id: I703f51fd74171813ef4031eb697b084343b4cd4e
Bill Yi [Mon, 2 Apr 2018 18:18:24 +0000 (18:18 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
2b7c92eb4c -s ours
Change-Id: I8c8079497c4c764bb16994624ad76857daa97e20
Bill Yi [Mon, 2 Apr 2018 18:15:09 +0000 (18:15 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
7f32755459 -s ours
Change-Id: Ie0a719062161f41e9398e8468fc53ce92f356660
Bernie Innocenti [Mon, 2 Apr 2018 18:13:42 +0000 (18:13 +0000)]
Merge "APF: drop multicast ICMPv6 while in doze mode"
am:
7880e284c8
Change-Id: Ie0b719e2f7391d02c859e9961fc72550c64a5249
Andrii Kulian [Mon, 2 Apr 2018 17:58:42 +0000 (17:58 +0000)]
Merge "Don't finish activity on duplicate resume request" into pi-dev
Sudheer Shanka [Mon, 2 Apr 2018 17:34:16 +0000 (17:34 +0000)]
Merge "Update uid state used for bucketizing data in fg vs bg states." into pi-dev
TreeHugger Robot [Mon, 2 Apr 2018 17:23:34 +0000 (17:23 +0000)]
Merge "Use per user info for seinfo" into pi-dev
TreeHugger Robot [Mon, 2 Apr 2018 15:32:01 +0000 (15:32 +0000)]
Merge "Fix right-most navbar icon tinting mismatch" into pi-dev
TreeHugger Robot [Mon, 2 Apr 2018 15:07:25 +0000 (15:07 +0000)]
Merge "Make addUnwantedCapability method public" into pi-dev
TreeHugger Robot [Mon, 2 Apr 2018 14:28:48 +0000 (14:28 +0000)]
Merge "Restore saveLayer APIs back into the public API." into pi-dev
Treehugger Robot [Mon, 2 Apr 2018 13:57:43 +0000 (13:57 +0000)]
Merge "APF: drop multicast ICMPv6 while in doze mode"
Bernie Innocenti [Wed, 28 Mar 2018 11:11:49 +0000 (20:11 +0900)]
APF: drop multicast ICMPv6 while in doze mode
Some WiFi hotspots send excessive multicast IPv6 ping requests which
cause considerable power drain. Thus, drop all multicast ICMPv6 ping
requests while the device is in doze mode.
Bug:
66930077
Test: runtest -x tests/net/java/android/net/apf/ApfTest.java
Test: manual - compared generated APF bytecode using apf_disassembler
Test: manual - force idle mode while sending multicast pings to device
Change-Id: I25dbf99985cf4413b4d0e3920d281fe6d663197a
Remi NGUYEN VAN [Mon, 2 Apr 2018 11:21:22 +0000 (11:21 +0000)]
Merge "Calculate multipath quota excluding current day." into pi-dev
TreeHugger Robot [Mon, 2 Apr 2018 09:42:26 +0000 (09:42 +0000)]
Merge "Fix PermissionMonitorTest that has been failing." into pi-dev
TreeHugger Robot [Mon, 2 Apr 2018 09:08:52 +0000 (09:08 +0000)]
Merge "TextClassifier API updates." into pi-dev
Remi NGUYEN VAN [Mon, 2 Apr 2018 06:48:19 +0000 (15:48 +0900)]
Calculate multipath quota excluding current day.
The current calculation includes data usage for the current day,
which causes the returned daily quota to change during the day.
This makes it difficult to use for callers that need a fixed
data limit for the day.
Current usage in MultipathPolicyTracker (the only caller) is
incorrect because of this, as it assumes that quota is not constantly
changing.
Test: Tests in go/ag/
3803612 pass
Bug: b/
72631572
Bug: b/
72877610
Change-Id: I9b3edde2dee7c7479d428e2bf2b73297afed3e6b
TreeHugger Robot [Mon, 2 Apr 2018 08:37:20 +0000 (08:37 +0000)]
Merge "apf: adjust JNI to accept_packet()'s new signature" into pi-dev
Chalard Jean [Mon, 2 Apr 2018 07:16:46 +0000 (16:16 +0900)]
Fix PermissionMonitorTest that has been failing.
The fail is related to a recent fix to PermissionMonitor
that went into pi-dev only : ag/
3799094, which fixed getting
the remote package name for the correct macro user instead of
the default. That fix had broken the test, this change fixes it.
Test: test now passes
Bug:
77315205
Change-Id: I26f8276eafe80478d5fefcff92e7dc2f12128bb4
Bernie Innocenti [Fri, 30 Mar 2018 08:12:02 +0000 (17:12 +0900)]
apf: adjust JNI to accept_packet()'s new signature
Bug:
73804303
Test: runtest -x tests/net/java/android/net/apf/ApfTest.java
Merged-Id: I0a3ad562496f3e06bc9527af4e038be3cdfe25c6
Merged-Id: I1674ac22f00af037ad415a4436b94b2eec6a02b7
Merged-Id: I966776e6574cbf167a6148e20d40e2bdcc887327
Change-Id: Id5c3cec5459ce6f9693457448002e60bbca6c09b
(cherry picked from commit
64bc32c5d4ae8a5c479a15615f99180476e9b2fa)
Remi NGUYEN VAN [Mon, 2 Apr 2018 05:40:04 +0000 (05:40 +0000)]
Merge "Add method to NetworkStatsService for UID stats." into pi-dev
Remi NGUYEN VAN [Mon, 2 Apr 2018 05:09:50 +0000 (05:09 +0000)]
Merge "Differentiate depleted and unset multipath quota" into pi-dev
Bill Yi [Mon, 2 Apr 2018 03:55:47 +0000 (03:55 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Bill Yi [Mon, 2 Apr 2018 03:54:39 +0000 (03:54 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Mon, 2 Apr 2018 03:50:26 +0000 (03:50 +0000)]
Merge "Fills font metrics before passing to ReplacementSpan" into pi-dev
TreeHugger Robot [Mon, 2 Apr 2018 03:48:25 +0000 (03:48 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Mon, 2 Apr 2018 03:35:17 +0000 (03:35 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Bo Zhu [Mon, 2 Apr 2018 03:02:03 +0000 (03:02 +0000)]
Merge "Skip the cert xml serial number check if the test root cert is in use" into pi-dev
TreeHugger Robot [Mon, 2 Apr 2018 02:45:27 +0000 (02:45 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Bill Yi [Mon, 2 Apr 2018 02:11:00 +0000 (19:11 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I4def9dedaf59e38981c2ea802aa54a0061da6a0b
TreeHugger Robot [Mon, 2 Apr 2018 00:58:23 +0000 (00:58 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Mon, 2 Apr 2018 00:57:21 +0000 (00:57 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Mon, 2 Apr 2018 00:19:24 +0000 (00:19 +0000)]
Merge "Add config flag to specify if wallpaper is rendered" into pi-dev
Bill Yi [Mon, 2 Apr 2018 00:05:30 +0000 (17:05 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I3d47b103c9f6150c224f78ecab946e12e5439954
Bill Yi [Sun, 1 Apr 2018 23:58:38 +0000 (16:58 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Icd25d4ae0e198ba80ad85cb0b8369500d7d00098
Bill Yi [Sun, 1 Apr 2018 23:51:45 +0000 (16:51 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I67084b2003296065cf866b5a2e933587f0d8b4a2
TreeHugger Robot [Sun, 1 Apr 2018 23:39:30 +0000 (23:39 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Bo Zhu [Sun, 1 Apr 2018 00:13:46 +0000 (17:13 -0700)]
Skip the cert xml serial number check if the test root cert is in use
Bug:
77165400
Test: runtest frameworks-services -p
com.android.server.locksettings.recoverablekeystore
Change-Id: I2242b4a97b9efa60a5a5ad7ab79e786951580299
Bill Yi [Sun, 1 Apr 2018 22:32:55 +0000 (15:32 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I1c0883a67a583134ec82c67269ca77c6a2d50830
Dianne Hackborn [Sun, 1 Apr 2018 22:26:18 +0000 (22:26 +0000)]
Merge "Fix issue #
77230164: Add app op to control foreground services" into pi-dev
Bill Yi [Sun, 1 Apr 2018 22:19:16 +0000 (15:19 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Id1811dea9422d20ad23a590ecf803776a9602c92
Bill Yi [Sun, 1 Apr 2018 22:05:31 +0000 (15:05 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I8f44cb512f7edaf24706ece3aa2b832e69379aea
Bill Yi [Sun, 1 Apr 2018 21:58:25 +0000 (14:58 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I3078289f1c8675b32cbeeeae1fdbb6558278fb28
TreeHugger Robot [Sun, 1 Apr 2018 20:31:28 +0000 (20:31 +0000)]
Merge "[Magnifier-36] Fix content clamping inside view" into pi-dev
TreeHugger Robot [Sun, 1 Apr 2018 19:51:53 +0000 (19:51 +0000)]
Merge "Don't allow using raw public keys to init recovery service any more" into pi-dev