OSDN Git Service
Emilian Peev [Tue, 3 Apr 2018 13:30:05 +0000 (06:30 -0700)]
Merge "Camera: Update external camera orientation guidelines" into pi-dev am:
7451945364
am:
905fd392ac
Change-Id: If290b4f36d5eceb43dba1d1efcb0e9913a670600
Emilian Peev [Tue, 3 Apr 2018 13:16:44 +0000 (06:16 -0700)]
Merge "Camera: Update external camera orientation guidelines" into pi-dev
am:
7451945364
Change-Id: I20b0458dee57cc804346b7104834ba1a619a1eb2
TreeHugger Robot [Tue, 3 Apr 2018 12:57:19 +0000 (12:57 +0000)]
Merge "Camera: Update external camera orientation guidelines" into pi-dev
David Brazdil [Tue, 3 Apr 2018 12:51:01 +0000 (05:51 -0700)]
Add more APIs to hidden API light greylist am:
78cea74881
am:
8a941bde2d
Change-Id: I6d6cdb4d8ce9e9c25c098c4a40949597ef6c7972
David Brazdil [Tue, 3 Apr 2018 12:40:25 +0000 (05:40 -0700)]
Add more APIs to hidden API light greylist
am:
78cea74881
Change-Id: Id1eb856211bc278cf999026d12861e1b5ba6f076
David Brazdil [Tue, 3 Apr 2018 10:15:18 +0000 (11:15 +0100)]
Add more APIs to hidden API light greylist
Bug:
64382372
Bug:
77289927
Bug:
77487374
Bug:
74430927
Test: make out/target/common/obj/PACKAGING/hiddenapi-blacklist.txt
Change-Id: I2a65babbef3ead001f37549c2c470b0e6c118ef3
Bernie Innocenti [Tue, 3 Apr 2018 10:06:41 +0000 (03:06 -0700)]
Merge "APF: drop multicast ICMPv6 while in doze mode" into pi-dev am:
1bc47a4c1d
am:
1f4f24d5bf
Change-Id: I52f7c4045090f3a6cf2b5ec322c22519fa50010f
Bernie Innocenti [Tue, 3 Apr 2018 09:57:42 +0000 (02:57 -0700)]
Merge "APF: drop multicast ICMPv6 while in doze mode" into pi-dev
am:
1bc47a4c1d
Change-Id: If8733a74e18ec6f39e46bdcb38757b74f91bc15e
Bernie Innocenti [Tue, 3 Apr 2018 09:42:19 +0000 (09:42 +0000)]
Merge "APF: drop multicast ICMPv6 while in doze mode" into pi-dev
Remi NGUYEN VAN [Tue, 3 Apr 2018 08:46:41 +0000 (01:46 -0700)]
Merge "Use user-defined data limits in multipath quota." into pi-dev am:
4ed5c186d1
am:
b6298d7ae3
Change-Id: I36563b55ad2a498e01103fb7b01f4efac720f680
Sanry Huang [Tue, 3 Apr 2018 08:30:36 +0000 (01:30 -0700)]
Merge "Fix wrong linear navigation order when TalkBack is on" into pi-dev am:
85d4aeb5c5
am:
411f5c3bad
Change-Id: I14b5b7d96d5518b72194e0ba7f4a9caa8d7b5c55
Tracy Zhou [Tue, 3 Apr 2018 08:24:19 +0000 (01:24 -0700)]
Merge "Fix PIP window going offset in landscape mode." into pi-dev am:
18603cdf81
am:
da03d77740
Change-Id: Ib1962589c2b396ffb15d5f51085699de49eab8c6
Remi NGUYEN VAN [Tue, 3 Apr 2018 08:22:53 +0000 (01:22 -0700)]
Merge "Use user-defined data limits in multipath quota." into pi-dev
am:
4ed5c186d1
Change-Id: Ic10e32c317f705477b72f3f696b1d8701804b73b
Remi NGUYEN VAN [Tue, 3 Apr 2018 08:07:08 +0000 (08:07 +0000)]
Merge "Use user-defined data limits in multipath quota." into pi-dev
Chenjie Yu [Tue, 3 Apr 2018 07:40:36 +0000 (00:40 -0700)]
Merge "Add fileds to AppCrash and ANR atoms" into pi-dev am:
60a24b97f7
am:
27b723d0dc
Change-Id: Ia171f05ed7e27dba8fcc48bfc4dc2e08b6fe3f1d
Erik Kline [Tue, 3 Apr 2018 07:34:37 +0000 (00:34 -0700)]
[automerger skipped] Merge "Refactor isTetheringSupported() calls" into pi-dev am:
5a36b3b6ea -s ours
am:
5f07ff8248 -s ours
Change-Id: Ic98c6fe03e5256b5fd33d5308bf8b2cd4b7dc42c
Sanry Huang [Tue, 3 Apr 2018 07:30:12 +0000 (00:30 -0700)]
Merge "android:ui crash on longpress of empty tile" into pi-dev am:
7a8aac8c6e
am:
0752251324
Change-Id: Id7c5b39533776c1334ceced857daac20cc1a2f1b
Dmitry Dementyev [Tue, 3 Apr 2018 07:25:52 +0000 (00:25 -0700)]
Merge "Revert "Throw invalid cert exception when deprecated initRecoveryService method"" into pi-dev am:
41d6d7c424
am:
64209d7b1a
Change-Id: I849a1b78ce08038bf7e134d0b6fe19de8e3c5246
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
(cherry picked from commit
e2c70f8a6092f740ea10e7476b33860d756cf94f)
Kweku Adams [Tue, 3 Apr 2018 07:06:25 +0000 (00:06 -0700)]
Merge "Disabling print dumping for now." into pi-dev am:
4df40c827e
am:
2fb025d007
Change-Id: I66c1400af72a823e180977547ac906e718c571eb
Chen Xu [Tue, 3 Apr 2018 06:53:00 +0000 (23:53 -0700)]
Merge "A test api to override carrier information" into pi-dev am:
b71c76036c
am:
1a1b0608ca
Change-Id: I65560ff163717b050c124fc0ff28a8958440f2b0
Brad Stenning [Tue, 3 Apr 2018 06:47:05 +0000 (23:47 -0700)]
Merge "Signal view is no loner apart of this fragment Removing custom battery display functionality until a complete fix is implemented." into pi-dev am:
1e617f5c20
am:
ca06781178
Change-Id: I3db2ae1e0ae5bae58abafc26a6a562bff0e62774
Bo Zhu [Tue, 3 Apr 2018 06:42:39 +0000 (23:42 -0700)]
Merge "Expose the JNI scrypt function in a standalone Java class so we can use it in RecoverableKeyStore as well" into pi-dev am:
1364455fd7
am:
d4cc378400
Change-Id: I9610319daa1a4cb728470283992c152d95926383
Brad Stenning [Tue, 3 Apr 2018 06:38:13 +0000 (23:38 -0700)]
Merge "Adding a member of Android Auto Embedded to the owners file" into pi-dev am:
943b315668
am:
6f1119a090
Change-Id: I698629139ddb8a9fd208163ffbc03655da9407f8
Gil O'Neil [Tue, 3 Apr 2018 06:33:45 +0000 (23:33 -0700)]
Merge "Made a note that app names may not contain delimiter characters" into pi-dev am:
c610677258
am:
b15319dcb5
Change-Id: Idc759f4d8e921784715719f8bc68a45b6c2095a8
Fyodor Kupolov [Tue, 3 Apr 2018 06:29:11 +0000 (23:29 -0700)]
Merge "[automerger skipped] Use concrete CREATOR instance for parceling lists am:
4921986db7 am:
609bc2d63e am:
3f13ccee8c -s ours" into pi-dev am:
3e8e71d1ec -s ours
am:
e5b4a8d9cc -s ours
Change-Id: Id3a29c32331d9cd75585f11d8757d98297681725
Remi NGUYEN VAN [Tue, 3 Apr 2018 06:20:37 +0000 (23:20 -0700)]
[automerger skipped] Merge "Fix network usage stats on 464xlat tethered." into pi-dev am:
cccd67b574 -s ours
am:
0e2563284c -s ours
Change-Id: I365d8b49ce7dbf99eeba99916452808ca102fa88
Yin-Chia Yeh [Tue, 3 Apr 2018 06:00:43 +0000 (23:00 -0700)]
Merge "Camera: fix errorFlag logic" into pi-dev am:
4ccefebb78
am:
fbb5c56f81
Change-Id: Id6b26fb903b31db38e0ec51d4fe2eeeefd9268c3
Jovana Knezevic [Tue, 3 Apr 2018 05:54:51 +0000 (22:54 -0700)]
Merge "Adding user accessor functions to UserManagerHelper." into pi-dev am:
c3724b5e91
am:
6d277663a7
Change-Id: I73d66562c071c483e3f63c290ef2b4bb09739691
Mihai Popa [Tue, 3 Apr 2018 05:45:57 +0000 (22:45 -0700)]
Merge "[Magnifier-38] Avoid deadlock causing ANR" into pi-dev am:
285797a45a
am:
da02fac9fe
Change-Id: I8ae04d1f8b6bebc8b1a1a2c01fe9d327b54839ae
Sanry Huang [Tue, 3 Apr 2018 05:44:04 +0000 (22:44 -0700)]
Merge "Fix wrong linear navigation order when TalkBack is on" into pi-dev
am:
85d4aeb5c5
Change-Id: If0126648fb836078812f704d522111162f3d9007
Derek Sollenberger [Tue, 3 Apr 2018 05:37:31 +0000 (22:37 -0700)]
Merge "Print detailed memory usage of Skia for dumpsys gfxinfo" into pi-dev am:
8ec341627c
am:
b0765db5b8
Change-Id: I7d534a8c8a58aa314f8beb719b5ff7e99a42815e
Sanry Huang [Tue, 3 Apr 2018 05:31:10 +0000 (05:31 +0000)]
Merge "Fix wrong linear navigation order when TalkBack is on" into pi-dev
Lorenzo Colitti [Tue, 3 Apr 2018 05:20:43 +0000 (22:20 -0700)]
Merge "Allow applications to query for foreground/background data usage." into pi-dev am:
3cafea0701
am:
a232ae53bc
Change-Id: I324e6d67db28e6076f1d422bb15d0b5190a9a6c3
Remi NGUYEN VAN [Mon, 2 Apr 2018 01:16:50 +0000 (10:16 +0900)]
Use user-defined data limits in multipath quota.
When data plan information is not available, use user-defined data
warning or limit to estimate a reasonable multipath quota.
New version of change to avoid editing NetworkPolicyManagerService.
Test: Tests in go/ag/
3828171 pass.
Bug:
72631572
Bug:
72877610
Change-Id: Ied4215a093377dc3322c4f18a83969d364c19b2a
Rob Carr [Tue, 3 Apr 2018 05:14:24 +0000 (22:14 -0700)]
Merge changes Ia9df12fa,Ib114e8cb into pi-dev am:
d8bfc71c6c
am:
653c02e438
Change-Id: I0ac0cd0c1be05381854b795532770a99fe5d2b2c
Tracy Zhou [Tue, 3 Apr 2018 05:11:20 +0000 (22:11 -0700)]
Merge "Fix PIP window going offset in landscape mode." into pi-dev
am:
18603cdf81
Change-Id: I489fcd7b889e3874b0ac6f43032ed0241b8545e2
Daniel Cashman [Tue, 3 Apr 2018 05:00:29 +0000 (22:00 -0700)]
Merge "Add ROLLBACK past signing cert capability." into pi-dev am:
0594af6dc3
am:
65a5d78899
Change-Id: I9c10d82c026008fbd95b313b52e1423c779b5203
Chenjie Yu [Tue, 3 Apr 2018 05:00:21 +0000 (22:00 -0700)]
Merge "Add fileds to AppCrash and ANR atoms" into pi-dev
am:
60a24b97f7
Change-Id: I45399dc23e13fc7030a66f6d6166d6f2434640ba
Erik Kline [Tue, 3 Apr 2018 04:53:07 +0000 (21:53 -0700)]
[automerger skipped] Merge "Refactor isTetheringSupported() calls" into pi-dev
am:
5a36b3b6ea -s ours
Change-Id: I2a970420521d9447d71dedb373bcf3098afd3d02
Sanry Huang [Tue, 3 Apr 2018 04:45:31 +0000 (21:45 -0700)]
Merge "android:ui crash on longpress of empty tile" into pi-dev
am:
7a8aac8c6e
Change-Id: I49deb50169e0245025caceb5bdf65f515f45ce8f
Jeff Sharkey [Tue, 3 Apr 2018 04:36:06 +0000 (21:36 -0700)]
Merge changes from topic "am-
8e33397accdd42de824f0124a3f51007" into pi-dev-plus-aosp
am:
ec5fab7006
Change-Id: I0c460b27edeb8d0db734d1c8092e7eb866e656cd
Dmitry Dementyev [Tue, 3 Apr 2018 04:36:05 +0000 (21:36 -0700)]
Merge "Revert "Throw invalid cert exception when deprecated initRecoveryService method"" into pi-dev
am:
41d6d7c424
Change-Id: I38d4c4d99879961631b6596d1f37a65afe11a5b1
Kweku Adams [Tue, 3 Apr 2018 04:21:31 +0000 (21:21 -0700)]
Merge "Disabling print dumping for now." into pi-dev
am:
4df40c827e
Change-Id: I8c44090b1f84a45d8a1a0e8a952cc540d54eacfb
Jeff Sharkey [Tue, 3 Apr 2018 04:21:22 +0000 (21:21 -0700)]
Obtain NPMS through helper method. am:
a435ab5124
am:
bfbae60fd4
Change-Id: I4278f93601da7f6ae580ae562b5ff8e86baf6abe
Hall Liu [Tue, 3 Apr 2018 04:06:14 +0000 (21:06 -0700)]
Merge "Change signature of requestBluetoothAudio" am:
545e20389d am:
442575f4f1
am:
2a74e5798d
Change-Id: Ia7fdee058a22521ec3e93ebb461d0197285bda5e
Brian C. Young [Tue, 3 Apr 2018 03:53:03 +0000 (20:53 -0700)]
Merge ""Unlocked device required" javadoc clarification" into pi-dev am:
084f9aee9a
am:
5ef26ddf60
Change-Id: I4754a4a2ff11480af778e72f927e6c3afd37f575
Chen Xu [Tue, 3 Apr 2018 03:52:47 +0000 (20:52 -0700)]
Merge "A test api to override carrier information" into pi-dev
am:
b71c76036c
Change-Id: I1d0be7c706e6dfffa3d83c96e7e48c2accd6269e
Todd Kennedy [Tue, 3 Apr 2018 03:45:38 +0000 (20:45 -0700)]
Merge "Exit the loop at the right time" into pi-dev am:
6d24a1c8be
am:
b9af84ca8d
Change-Id: Ib9b12c8e7f2f832e28f19302278ed2685918a51e
Brad Stenning [Tue, 3 Apr 2018 03:41:26 +0000 (20:41 -0700)]
Merge "Signal view is no loner apart of this fragment Removing custom battery display functionality until a complete fix is implemented." into pi-dev
am:
1e617f5c20
Change-Id: Ifeccb66d335bc5413861732dfd434eea46ea53dc
Bo Zhu [Tue, 3 Apr 2018 03:36:36 +0000 (20:36 -0700)]
Merge "Expose the JNI scrypt function in a standalone Java class so we can use it in RecoverableKeyStore as well" into pi-dev
am:
1364455fd7
Change-Id: I6fc53616ec67bbb2770541958745d10f766f8b3d
TreeHugger Robot [Tue, 3 Apr 2018 03:35:40 +0000 (03:35 +0000)]
Merge "Fix PIP window going offset in landscape mode." into pi-dev
Brad Stenning [Tue, 3 Apr 2018 03:31:58 +0000 (20:31 -0700)]
Merge "Adding a member of Android Auto Embedded to the owners file" into pi-dev
am:
943b315668
Change-Id: Ibbcfd7e79a81ec5961a8997cf5d209076d4fe43d
Gil O'Neil [Tue, 3 Apr 2018 03:27:23 +0000 (20:27 -0700)]
Merge "Made a note that app names may not contain delimiter characters" into pi-dev
am:
c610677258
Change-Id: I9581a7af5f34111ee3608f3ec2088fc9b0fffdcd
Fyodor Kupolov [Tue, 3 Apr 2018 03:22:44 +0000 (20:22 -0700)]
Merge "[automerger skipped] Use concrete CREATOR instance for parceling lists am:
4921986db7 am:
609bc2d63e am:
3f13ccee8c -s ours" into pi-dev
am:
3e8e71d1ec -s ours
Change-Id: I921551eb006ac41034c730ad5d27c2831160ad9b
Remi NGUYEN VAN [Tue, 3 Apr 2018 03:15:50 +0000 (20:15 -0700)]
[automerger skipped] Merge "Fix network usage stats on 464xlat tethered." into pi-dev
am:
cccd67b574 -s ours
Change-Id: I49845b0bc0183d4d1a6c694a70e30a90a9a59759
Yin-Chia Yeh [Tue, 3 Apr 2018 03:05:25 +0000 (20:05 -0700)]
Merge "Camera: fix errorFlag logic" into pi-dev
am:
4ccefebb78
Change-Id: I179c350218f4c5083a32c043f86e8b30f428d4da
Jovana Knezevic [Tue, 3 Apr 2018 02:58:05 +0000 (19:58 -0700)]
Merge "Adding user accessor functions to UserManagerHelper." into pi-dev
am:
c3724b5e91
Change-Id: If7acce092d6360ca64f1a4115ebd59ef8d185435
Mihai Popa [Tue, 3 Apr 2018 02:53:48 +0000 (19:53 -0700)]
Merge "[Magnifier-38] Avoid deadlock causing ANR" into pi-dev
am:
285797a45a
Change-Id: I81474f04a8d33d2cf063aa0d89b7abca255d3864
Android Build Merger (Role) [Tue, 3 Apr 2018 02:51:37 +0000 (02:51 +0000)]
Merge "Merge "Work on issue #
74404949: Screen state usage API" into pi-dev am:
886fc6aef0 am:
b45bc522f6"
Dianne Hackborn [Tue, 3 Apr 2018 02:50:56 +0000 (19:50 -0700)]
Merge "Work on issue #
74404949: Screen state usage API" into pi-dev am:
886fc6aef0
am:
b45bc522f6
Change-Id: If566b8baf8367f31d0f8dc1107c547cc9ee11913
Derek Sollenberger [Tue, 3 Apr 2018 02:49:15 +0000 (19:49 -0700)]
Merge "Print detailed memory usage of Skia for dumpsys gfxinfo" into pi-dev
am:
8ec341627c
Change-Id: I9c3ac77a3743afe6980cdaca8ce324d4913945b9
Doris Liu [Tue, 3 Apr 2018 02:46:43 +0000 (02:46 +0000)]
Merge "Remove unnecessary value setting in AnimatorSet seeking"
Lucas Dupin [Tue, 3 Apr 2018 02:44:54 +0000 (19:44 -0700)]
Merge "Remove old alarm IPC" into pi-dev am:
ae6b800562
am:
9f4e4072e5
Change-Id: I565a3592ce9090de89d8afdb16abe9106c23371d
Shawn Willden [Tue, 3 Apr 2018 02:40:18 +0000 (19:40 -0700)]
Merge "Rename trustedUserPresenceRequired." into pi-dev am:
840c29eb0b
am:
7d64fc4141
Change-Id: If6d9e3674fa75f4383a4d2ddc12612ed2f8e452b
Lorenzo Colitti [Tue, 3 Apr 2018 02:37:19 +0000 (19:37 -0700)]
Merge "Allow applications to query for foreground/background data usage." into pi-dev
am:
3cafea0701
Change-Id: I755f6d28c3e881fb2f6ee864f63eb2a080a1045d
TreeHugger Robot [Tue, 3 Apr 2018 02:31:27 +0000 (02:31 +0000)]
Merge "Add fileds to AppCrash and ANR atoms" into pi-dev
Rob Carr [Tue, 3 Apr 2018 02:30:01 +0000 (19:30 -0700)]
Merge changes Ia9df12fa,Ib114e8cb into pi-dev
am:
d8bfc71c6c
Change-Id: Iaf70839958e257d195cb0538b1951771a0c7790b
TreeHugger Robot [Tue, 3 Apr 2018 02:25:49 +0000 (02:25 +0000)]
Merge "Refactor isTetheringSupported() calls" into pi-dev
Sanry Huang [Tue, 3 Apr 2018 02:22:48 +0000 (02:22 +0000)]
Merge "android:ui crash on longpress of empty tile" into pi-dev
Daniel Cashman [Tue, 3 Apr 2018 02:16:09 +0000 (19:16 -0700)]
Merge "Add ROLLBACK past signing cert capability." into pi-dev
am:
0594af6dc3
Change-Id: I4057024e5a9369f0dc9c5e3ada14d338202fb1c6
Android Build Merger (Role) [Tue, 3 Apr 2018 01:59:52 +0000 (01:59 +0000)]
Merge changes from topic "am-
8e33397accdd42de824f0124a3f51007" into pi-dev-plus-aosp
* changes:
Merge changes from topic "planz" into pi-dev am:
93e11759d6
Obtain NPMS through helper method. am:
a435ab5124
Jeff Sharkey [Tue, 3 Apr 2018 01:59:01 +0000 (18:59 -0700)]
Merge changes from topic "planz" into pi-dev
am:
93e11759d6
Change-Id: I342eb26c7e50582c1ce34a7c8b70dadbb7881858
Bryce Lee [Tue, 3 Apr 2018 01:58:11 +0000 (18:58 -0700)]
Merge "Do not set activity's task before clearing in some scenarios." into pi-dev am:
540f747861
am:
e88e558484
Change-Id: I8c81d2cbbecba64829096457303f361d4aa54698
TreeHugger Robot [Tue, 3 Apr 2018 01:55:30 +0000 (01:55 +0000)]
Merge "Revert "Throw invalid cert exception when deprecated initRecoveryService method"" into pi-dev
Jeff Sharkey [Tue, 3 Apr 2018 01:52:26 +0000 (18:52 -0700)]
Obtain NPMS through helper method.
am:
a435ab5124
Change-Id: Ic5db497a0d5793de4bdba2474e2abf17ddf201fc
Jeff Tinker [Tue, 3 Apr 2018 01:52:23 +0000 (18:52 -0700)]
Merge "Updates MediaDrm developer docs" into pi-dev am:
1c967fe075
am:
d2dc31b5b8
Change-Id: I94356f44fe3e9b1e381662ae702eb078ff8c4897
Hall Liu [Tue, 3 Apr 2018 01:46:50 +0000 (18:46 -0700)]
Merge "Change signature of requestBluetoothAudio" am:
545e20389d
am:
442575f4f1
Change-Id: Ic10b762e04d74635663fa97f5879072ebe00eca9
TreeHugger Robot [Tue, 3 Apr 2018 01:36:23 +0000 (01:36 +0000)]
Merge "Disabling print dumping for now." into pi-dev
Hall Liu [Tue, 3 Apr 2018 01:30:51 +0000 (18:30 -0700)]
Merge "Change signature of requestBluetoothAudio"
am:
545e20389d
Change-Id: I9fc7399bf01bbe0c1def43cc9cf543c0000b827c
Tracy Zhou [Tue, 3 Apr 2018 01:19:43 +0000 (18:19 -0700)]
Fix PIP window going offset in landscape mode.
In landscape mode, PIP window can go offset while launching IME. We want to align the top of the PIP window with the top of the movement bounds in that case.
Change-Id: I7e89538c9a51d78294037b474caedcdf31edf7c4
Fixes:
77337070
Test: Manual test
Brian C. Young [Tue, 3 Apr 2018 01:29:11 +0000 (18:29 -0700)]
Merge ""Unlocked device required" javadoc clarification" into pi-dev
am:
084f9aee9a
Change-Id: Icb6580e3c7ee5a1b5cbacbd99eb769e3f55b5d9a
Felipe Leme [Tue, 3 Apr 2018 01:22:37 +0000 (18:22 -0700)]
Merge "Don't use a copy of window params when showing a dialog." into pi-dev am:
3f6b7714a7
am:
558e9116fb
Change-Id: I2c5822125c734fbf5d11465fb5b59368094d3f76
Todd Kennedy [Tue, 3 Apr 2018 01:20:20 +0000 (18:20 -0700)]
Merge "Exit the loop at the right time" into pi-dev
am:
6d24a1c8be
Change-Id: Idbf0953a3fb4dd38640009a0b213dace99a282c5
Chen Xu [Tue, 3 Apr 2018 01:14:24 +0000 (01:14 +0000)]
Merge "A test api to override carrier information" into pi-dev
Frank Salim [Tue, 3 Apr 2018 01:13:00 +0000 (18:13 -0700)]
Merge "Revise secure key import API after review" into pi-dev am:
50228a6471
am:
1a2743029a
Change-Id: I9acd33f63a49b0af86a98f98e3eed564f779502f
Yi Jin [Tue, 3 Apr 2018 01:09:44 +0000 (18:09 -0700)]
Remove some letters of verbose log am:
ea31cbea93
am:
8700c43483
Change-Id: Iae50eac61ab255113218e3e5503e9f74a40623ff
Yi Jin [Tue, 3 Apr 2018 01:07:02 +0000 (18:07 -0700)]
Merge "Use modern c++ code style for incidentd." into pi-dev am:
56051569ab
am:
85d3cc02a1
Change-Id: Ia85dd17da1e0aefbb3bdece55c96f4e6b6686119
Andrii Kulian [Tue, 3 Apr 2018 01:03:36 +0000 (18:03 -0700)]
Merge "Don't finish activity on duplicate resume request" into pi-dev am:
38af02e75b
am:
4f632a306f
Change-Id: I016967a65cbbce525088d3c008d5bb311dc69d83
Sudheer Shanka [Tue, 3 Apr 2018 01:00:12 +0000 (18:00 -0700)]
Merge "Update uid state used for bucketizing data in fg vs bg states." into pi-dev am:
8303baf4d0
am:
99b208a705
Change-Id: Iff6aacfe864d7a7548ab461ae704fafe2ba92fde
Doris Liu [Mon, 2 Apr 2018 23:37:17 +0000 (16:37 -0700)]
Remove unnecessary value setting in AnimatorSet seeking
Also fixed seeking in paused state
BUG:
68274315
BUG:
68382377
Test: ag/
3835109
Change-Id: Ifa6b717a77a34f2152bd0e7ad285556986dd47ff
Dianne Hackborn [Tue, 3 Apr 2018 00:52:06 +0000 (17:52 -0700)]
Merge "Work on issue #
74404949: Screen state usage API" into pi-dev
am:
886fc6aef0
Change-Id: Ia612052dee8b7729900ab091ecae7db073f8d9fd
Lucas Dupin [Tue, 3 Apr 2018 00:46:39 +0000 (17:46 -0700)]
Merge "Remove old alarm IPC" into pi-dev
am:
ae6b800562
Change-Id: I60977022c6075e1fa3aa27156733eb41891e5b26
Shawn Willden [Tue, 3 Apr 2018 00:43:45 +0000 (17:43 -0700)]
Merge "Rename trustedUserPresenceRequired." into pi-dev
am:
840c29eb0b
Change-Id: I197f09918da53af24dbdf73f514ede750129d4f6
TreeHugger Robot [Tue, 3 Apr 2018 00:30:34 +0000 (00:30 +0000)]
Merge "Signal view is no loner apart of this fragment Removing custom battery display functionality until a complete fix is implemented." into pi-dev
Bo Zhu [Tue, 3 Apr 2018 00:28:43 +0000 (00:28 +0000)]
Merge "Expose the JNI scrypt function in a standalone Java class so we can use it in RecoverableKeyStore as well" into pi-dev
TreeHugger Robot [Tue, 3 Apr 2018 00:25:47 +0000 (00:25 +0000)]
Merge "Adding a member of Android Auto Embedded to the owners file" into pi-dev
Bryce Lee [Tue, 3 Apr 2018 00:24:11 +0000 (00:24 +0000)]
Merge "Do not set activity's task before clearing in some scenarios." into pi-dev
am:
540f747861
Change-Id: Ida4807ded086a070e2e905f03d298ffd4c6ab98b
Dmitry Dementyev [Tue, 3 Apr 2018 00:16:20 +0000 (00:16 +0000)]
Revert "Throw invalid cert exception when deprecated initRecoveryService method"
This reverts commit
50bc7e42d73c9ca8d77dcd538619c6d6eeaf6dea.
Reason for revert: API is still used by old binary
Change-Id: I3c8348211baa26245786abda6360a8df96e2d223
Bug:
77293264
Jeff Tinker [Tue, 3 Apr 2018 00:16:19 +0000 (00:16 +0000)]
Merge "Updates MediaDrm developer docs" into pi-dev
am:
1c967fe075
Change-Id: I218679fc0cf338389dfb489ba591d3480601280f
OSDN Git Service
