OSDN Git Service
Seigo Nonaka [Mon, 2 Apr 2018 21:21:59 +0000 (21:21 +0000)]
Merge "Fills font metrics before passing to ReplacementSpan" into pi-dev am:
138148425c
am:
f0a302f119
Change-Id: I30e9dfd37853001f77f655b74445d2861f05e12b
Bill Yi [Mon, 2 Apr 2018 21:16:11 +0000 (21:16 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
299491afe1 -s ours
am:
469a4ce1d2 -s ours
Change-Id: Idbe486c3bd6a2b60299b8a988124b73fd3d5dd6a
Bill Yi [Mon, 2 Apr 2018 21:15:45 +0000 (21:15 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
aaa2849890 -s ours
am:
2a3fcd8c9f -s ours
Change-Id: I2a14c3144042b5a90febd68b95c5c97e3dfde0e4
Bo Zhu [Mon, 2 Apr 2018 21:15:18 +0000 (21:15 +0000)]
Merge "Skip the cert xml serial number check if the test root cert is in use" into pi-dev am:
3cd574ced9
am:
4c7cc36000
Change-Id: I2ea971fcc97f88679ba8436b0e2bf4a2de08a856
Bill Yi [Mon, 2 Apr 2018 21:11:08 +0000 (21:11 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
85e4a97789 -s ours
am:
73af74db6c -s ours
Change-Id: I44a8c5f57d3d00311441c3fff7bdeba5d9e04fcb
Bill Yi [Mon, 2 Apr 2018 21:10:33 +0000 (21:10 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
879127f31d -s ours
am:
edc08f4382 -s ours
Change-Id: Ibb74eb19844dfe8bc0348ee095202a2703cc3e28
Bill Yi [Mon, 2 Apr 2018 20:52:51 +0000 (20:52 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
f03441f47f -s ours
am:
b9de890ab5 -s ours
Change-Id: I3e0aac4393c3cf2715283d69ec9dfd1af5f4cac1
Daichi Hirono [Mon, 2 Apr 2018 20:52:23 +0000 (20:52 +0000)]
Merge "Add config flag to specify if wallpaper is rendered" into pi-dev am:
c0f8eb345a
am:
e36dae9aa6
Change-Id: Ibb9e47b84e8b32f1ff9e169b485577c6fe9559ff
Bill Yi [Mon, 2 Apr 2018 20:48:09 +0000 (20:48 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
da6cff4e08 -s ours
am:
7c2c6f36e6 -s ours
Change-Id: I83105881a3b70bcb7c04c9cae1dd8aa4a001d055
Android Build Merger (Role) [Mon, 2 Apr 2018 20:40:45 +0000 (20:40 +0000)]
Merge "Merge "Fix issue #
77230164: Add app op to control foreground services" into pi-dev am:
21306849e6 am:
1eec82353c"
Dianne Hackborn [Mon, 2 Apr 2018 20:39:22 +0000 (20:39 +0000)]
Merge "Fix issue #
77230164: Add app op to control foreground services" into pi-dev am:
21306849e6
am:
1eec82353c
Change-Id: Id62ee94ade97b55eb088a0ff8abf2ce0b994ef68
TreeHugger Robot [Mon, 2 Apr 2018 20:36:43 +0000 (20:36 +0000)]
Merge "Added decoding of truncated AAPT string lengths."
Mihai Popa [Mon, 2 Apr 2018 20:33:44 +0000 (20:33 +0000)]
Merge "[Magnifier-36] Fix content clamping inside view" into pi-dev am:
4ab18af48a
am:
e5e39b534b
Change-Id: I47394c618e10eb42ae6508f1593f8dc1c4078d90
Bo Zhu [Mon, 2 Apr 2018 20:19:17 +0000 (20:19 +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
am:
bef26a2ada
Change-Id: Ic1ea494ddaf13bac2fd1a52c1c0961f012906d68
Dmitry Dementyev [Mon, 2 Apr 2018 20:07:29 +0000 (20:07 +0000)]
Merge "Merge "Throw invalid cert exception when deprecated initRecoveryService method is used." into pi-dev am:
bf08774704" into pi-dev-plus-aosp
am:
0a55c385db
Change-Id: I23c58ffecb005b8fcb938d9a25afccdabdc7b09d
Bo Zhu [Mon, 2 Apr 2018 19:56:48 +0000 (19:56 +0000)]
Merge "Merge "Throw an exception if the given root alias is unknown" into pi-dev am:
49eb4c1f1f" into pi-dev-plus-aosp
am:
4db0bb58ce
Change-Id: I559fdbc3e29c3281146317987447f2be5bd02d7d
TreeHugger Robot [Mon, 2 Apr 2018 19:47:39 +0000 (19:47 +0000)]
Merge "Add ROLLBACK past signing cert capability."
Lucas Dupin [Mon, 2 Apr 2018 19:45:46 +0000 (19:45 +0000)]
Merge "Merge "Slice row redlines and animations" into pi-dev am:
9009654c1d" into pi-dev-plus-aosp
am:
d7ab87a945
Change-Id: I9da562471a1f26f11231b73eff4d03ac77984934
Bill Yi [Mon, 2 Apr 2018 19:34:13 +0000 (19:34 +0000)]
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
07a75e0f9f -s ours" into pi-dev-plus-aosp
am:
90fc3e3592 -s ours
Change-Id: I2acc1bf899c0500c9a1a16fe073b76ad3dc8fe71
Jan Althaus [Mon, 2 Apr 2018 19:32:31 +0000 (19:32 +0000)]
Merge "Merge "Change Locate to Map for address selections" into pi-dev am:
03061a7903" into pi-dev-plus-aosp
am:
fbf46f6981
Change-Id: I1ea9a28699c775f29e0ae6c8b419bab46e337dea
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:21:03 +0000 (19:21 +0000)]
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
38dccc3fff -s ours" into pi-dev-plus-aosp
am:
d471070afc -s ours
Change-Id: I002d1ecbc201135b2cab6336c78433a6e101149a
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
Ryan Mitchell [Thu, 29 Mar 2018 22:49:10 +0000 (15:49 -0700)]
Added decoding of truncated AAPT string lengths.
AAPT incorrectly writes a truncated string length when the string size
exceeded the maximum possible encode length value (0x7FFF). To decode a
truncated length, this change iterates through length values that end
in the encode length bits. Strings that exceed the maximum encode length
are not placed into StringPools in AAPT2.
Test: Successfully ran broken apps from the duplicates of the bugs
provided and created tests
Bug:
69320870
Change-Id: I99dd9b63e91ac250f81d5dfc26b7c0e6276ae162
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
Bill Yi [Mon, 2 Apr 2018 19:12:14 +0000 (19:12 +0000)]
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
46b20b4e18 -s ours" into pi-dev-plus-aosp
am:
28ce9be592 -s ours
Change-Id: Ib85a83cb94373dea6740254159cc775f386aa6fe
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
Ryan Mitchell [Mon, 2 Apr 2018 19:07:24 +0000 (19:07 +0000)]
Merge "Fixed resource bag retrieval infinite recursion."
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
Bernie Innocenti [Mon, 2 Apr 2018 18:51:02 +0000 (18:51 +0000)]
Merge "Merge "APF: drop multicast ICMPv6 while in doze mode" am:
7880e284c8 am:
f0ddd72f0f" into pi-dev-plus-aosp
am:
7276ad54fc
Change-Id: Ibc546739cbbcaba635967bb95b91bb5b0a4068e2
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
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
Bill Yi [Mon, 2 Apr 2018 18:37:53 +0000 (18:37 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
292a890081 -s ours
am:
6e5e0f5887 -s ours
Change-Id: Ia35a68f4252ff525586f25b4ea8432ff8cec8b70
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
Bill Yi [Mon, 2 Apr 2018 18:35:49 +0000 (18:35 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
5080670104 -s ours
am:
13762aaa63 -s ours
Change-Id: I91e6fc7f632f51c1e4812a7baf3668e8ed8b52ba
Bill Yi [Mon, 2 Apr 2018 18:34:14 +0000 (18:34 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
89af056de6 -s ours
am:
defc0f3ddf -s ours
Change-Id: I97e2e51a12704374f1f16624bdb7dfe22c99f3a8
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
Bill Yi [Mon, 2 Apr 2018 18:32:20 +0000 (18:32 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
86fdaf1a6b -s ours
am:
7a7f15609b -s ours
Change-Id: I1ee7e4adacb4066fee4ff501f5f6cefe497c24da
Bill Yi [Mon, 2 Apr 2018 18:30:30 +0000 (18:30 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
2b7c92eb4c -s ours
am:
1876333dc3 -s ours
Change-Id: I97bcd643747c1b42587935f9a63aa6b755717e0d
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
Bill Yi [Mon, 2 Apr 2018 18:26:56 +0000 (18:26 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
7f32755459 -s ours
am:
ca13839616 -s ours
Change-Id: Icf4052937c598068851e19b8ac09c3eda5bee96f
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
Treehugger Robot [Mon, 2 Apr 2018 13:57:43 +0000 (13:57 +0000)]
Merge "APF: drop multicast ICMPv6 while in doze mode"
Wale Ogunwale [Thu, 29 Mar 2018 17:12:53 +0000 (10:12 -0700)]
Don't show show unsupported sdk warning for platform in development
Change-Id: I1526551bee804b76e8ca3ca0684d48b2be3d872f
Bug:
75318890
Test: atest CtsActivityManagerDeviceTestCases:PrereleaseSdkTest
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
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 [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
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
Dmitry Dementyev [Sun, 1 Apr 2018 19:34:31 +0000 (19:34 +0000)]
Merge "Throw invalid cert exception when deprecated initRecoveryService method is used." into pi-dev
TreeHugger Robot [Sun, 1 Apr 2018 19:30:29 +0000 (19:30 +0000)]
Merge "Throw an exception if the given root alias is unknown" into pi-dev
Mihai Popa [Tue, 27 Mar 2018 13:43:08 +0000 (14:43 +0100)]
[Magnifier-36] Fix content clamping inside view
We try to never display in the magnifier content that does not belong to
the magnified view. If the magnified view has one or more scrollable
containers, these have to be considered in order to find out the visible
portion of the view which is not masked by scrollable containers.
The previous logic for computing the visible region was wrong when one
of the containers was a ViewPager, whose getScrollX() returns the scroll
relative to all pages, rather than the currently visible one as the
logic was expecting. This CL replaces the old logic with a
View#getGlobalVisibleRect().
Bug:
74359490
Test: atest CtsWidgetTestCases:android.widget.cts.MagnifierTest
Change-Id: Ib6b63a35436aa691f29c13a0789688f23bfca9f1
Lucas Dupin [Sun, 1 Apr 2018 16:13:49 +0000 (16:13 +0000)]
Merge "Slice row redlines and animations" into pi-dev
Bo Zhu [Fri, 30 Mar 2018 18:31:53 +0000 (11:31 -0700)]
Throw an exception if the given root alias is unknown
Bug:
76433465
Test: runtest frameworks-services -p
com.android.server.locksettings.recoverablekeystore
Change-Id: I3a213ab0cd3b0e9c002bc44d4ce929977e119e81
TreeHugger Robot [Sun, 1 Apr 2018 04:08:32 +0000 (04:08 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Bill Yi [Sat, 31 Mar 2018 14:49:41 +0000 (07:49 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I8a72daf0c83337a251f03738393db2f7e26e9caf
TreeHugger Robot [Sat, 31 Mar 2018 21:24:14 +0000 (21:24 +0000)]
Merge "Change Locate to Map for address selections" into pi-dev
Bo Zhu [Sat, 31 Mar 2018 20:08:49 +0000 (13:08 -0700)]
Don't allow using raw public keys to init recovery service any more
Bug:
75952916
Test: runtest frameworks-services -p
com.android.server.locksettings.recoverablekeystore
Change-Id: I06ceddbc116396936d53d804d8d5466efee6aaa7
TreeHugger Robot [Sat, 31 Mar 2018 20:00:20 +0000 (20:00 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Sat, 31 Mar 2018 19:50:38 +0000 (19:50 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev