OSDN Git Service
Ruchi Kandoi [Tue, 3 Apr 2018 19:46:21 +0000 (12:46 -0700)]
Merge "Add an Executor for the onConnectedListener" am:
0d1f7933a3 am:
a6c7187242
am:
6728fbf6ef
Change-Id: Ia1487f831aa1608525d6f0d01cb6f0b10b1e0b54
Ruchi Kandoi [Tue, 3 Apr 2018 19:28:43 +0000 (12:28 -0700)]
Merge "Add an Executor for the onConnectedListener" am:
0d1f7933a3
am:
a6c7187242
Change-Id: I99338270ac10c27b68bd851a844259441145c186
Ruchi Kandoi [Tue, 3 Apr 2018 19:17:37 +0000 (12:17 -0700)]
Merge "Add an Executor for the onConnectedListener"
am:
0d1f7933a3
Change-Id: Ie1075238c6339c7964c14ef82f6db2d499ca03a3
Yangster-mac [Tue, 3 Apr 2018 18:55:08 +0000 (11:55 -0700)]
Merge "Move forward the alarm timestamp when config is added to statsd." into pi-dev am:
7219f8bac8
am:
25f94aa599
Change-Id: I332938683e3b2445f68121692e25bf741106f2f6
Nicolas Geoffray [Tue, 3 Apr 2018 18:46:30 +0000 (11:46 -0700)]
Merge "Add com.android.development to the package whitelist." into pi-dev am:
9c9177eb6b
am:
f39da1b522
Change-Id: I329e50e8b15680d24a01b5ef453f63b1046092d4
Yangster-mac [Tue, 3 Apr 2018 18:27:50 +0000 (11:27 -0700)]
Merge "Move forward the alarm timestamp when config is added to statsd." into pi-dev
am:
7219f8bac8
Change-Id: I04263e131472d5b0f0f3ffd408988d4b44a6b195
Pankaj Kanwar [Tue, 3 Apr 2018 18:26:37 +0000 (11:26 -0700)]
[automerger skipped] Merge "Address IMSI privacy issues." am:
644d5ea61c am:
41864c2abe -s ours
am:
89f0ff566b -s ours
Change-Id: I09007d463877603d9e95466c87319f922d156ef3
Pankaj Kanwar [Tue, 3 Apr 2018 18:19:49 +0000 (11:19 -0700)]
[automerger skipped] Merge "Address IMSI privacy issues." am:
644d5ea61c -s ours
am:
dc07673645 -s ours
Change-Id: I0179dfebcc776d6dc565f9651f591a3411e323f8
pkanwar [Tue, 3 Apr 2018 18:14:23 +0000 (11:14 -0700)]
[automerger skipped] Address IMSI privacy issues. am:
26509cda7e -s ours
am:
bedcade443 -s ours
Change-Id: I5b0e1d2ee0f0f64c9cd401414c139ca3400db0e1
Nicolas Geoffray [Tue, 3 Apr 2018 17:57:47 +0000 (10:57 -0700)]
Merge "Add com.android.development to the package whitelist." into pi-dev
am:
9c9177eb6b
Change-Id: I44aafbc02236593bf9631e4909453f2cc357d03f
TreeHugger Robot [Tue, 3 Apr 2018 17:57:43 +0000 (17:57 +0000)]
Merge "Move forward the alarm timestamp when config is added to statsd." into pi-dev
Pankaj Kanwar [Tue, 3 Apr 2018 17:52:18 +0000 (10:52 -0700)]
[automerger skipped] Merge "Address IMSI privacy issues." am:
644d5ea61c
am:
41864c2abe -s ours
Change-Id: Ia4aa4e45b2c9c9cd988976a3d5208f5c2e0e0961
Pankaj Kanwar [Tue, 3 Apr 2018 17:47:04 +0000 (10:47 -0700)]
[automerger skipped] Merge "Address IMSI privacy issues."
am:
644d5ea61c -s ours
Change-Id: Iba8cba90d15937b7cd0ecd32a78636de8e008644
Yin-Chia Yeh [Tue, 3 Apr 2018 17:46:12 +0000 (10:46 -0700)]
Merge "Camera: sort getCameraIdList output" into pi-dev am:
3275d9a004
am:
8d018c52a5
Change-Id: I62b5cd77286e678b748b769c90f02eb79e466da6
pkanwar [Tue, 3 Apr 2018 17:42:58 +0000 (10:42 -0700)]
[automerger skipped] Address IMSI privacy issues.
am:
26509cda7e -s ours
Change-Id: I6d2790e3e86c874e88a75c08c1b296461e79fe33
TreeHugger Robot [Tue, 3 Apr 2018 17:40:33 +0000 (17:40 +0000)]
Merge "Add com.android.development to the package whitelist." into pi-dev
Lucas Dupin [Tue, 3 Apr 2018 17:33:45 +0000 (10:33 -0700)]
Merge "Do not run peek animation when keyguard is fading" into pi-dev am:
3e57c9f525
am:
bb3366a564
Change-Id: I1bc8281004fdbd6735930cc8e3b3059fb778fd01
Pankaj Kanwar [Tue, 3 Apr 2018 17:33:40 +0000 (10:33 -0700)]
Merge "Address IMSI privacy issues."
am:
644d5ea61c
Change-Id: Ib64e54022279c886126477e152f9acd835d45913
Yin-Chia Yeh [Tue, 3 Apr 2018 17:31:26 +0000 (10:31 -0700)]
Merge "Camera: sort getCameraIdList output" into pi-dev
am:
3275d9a004
Change-Id: I7914103dc8827ae5b02733d432d227612e9eb6ae
Lucas Dupin [Tue, 3 Apr 2018 17:18:26 +0000 (10:18 -0700)]
Merge "Do not run peek animation when keyguard is fading" into pi-dev
am:
3e57c9f525
Change-Id: I90543988ee3465c30c79a1f90f238979cc009b8b
TreeHugger Robot [Tue, 3 Apr 2018 17:13:39 +0000 (17:13 +0000)]
Merge "Camera: sort getCameraIdList output" into pi-dev
Lucas Dupin [Tue, 3 Apr 2018 17:07:03 +0000 (17:07 +0000)]
Merge "Do not run peek animation when keyguard is fading" into pi-dev
Ruchi Kandoi [Tue, 3 Apr 2018 16:48:18 +0000 (16:48 +0000)]
Merge "Add an Executor for the onConnectedListener"
Mathieu Chartier [Tue, 3 Apr 2018 16:36:54 +0000 (09:36 -0700)]
Merge "Add dedicated flag to control app image generation" into pi-dev am:
7ee86d1dbc
am:
0694702c62
Change-Id: I75ddbebe3adea3207706c82fbca77329e4939535
Mathieu Chartier [Tue, 3 Apr 2018 16:26:41 +0000 (09:26 -0700)]
Merge "Add dedicated flag to control app image generation" into pi-dev
am:
7ee86d1dbc
Change-Id: Ia6b87f484bfeb13d358b6283ad319d1d4aeba60c
Seigo Nonaka [Tue, 3 Apr 2018 16:26:38 +0000 (09:26 -0700)]
Merge "Make getText hidden and getWidth/getBounds public" into pi-dev am:
3a2d4143ee
am:
88226e2e3e
Change-Id: I63df61818bef595c9d2e83c5bfe9c678471291c1
Seigo Nonaka [Tue, 3 Apr 2018 16:12:51 +0000 (09:12 -0700)]
Merge "Make getText hidden and getWidth/getBounds public" into pi-dev
am:
3a2d4143ee
Change-Id: I618167a2c5afc153a51444b09f315179ff2dc83a
Pankaj Kanwar [Tue, 3 Apr 2018 16:05:51 +0000 (16:05 +0000)]
Merge "Address IMSI privacy issues."
Mathieu Chartier [Tue, 3 Apr 2018 16:04:32 +0000 (16:04 +0000)]
Merge "Add dedicated flag to control app image generation" into pi-dev
Seigo Nonaka [Tue, 3 Apr 2018 15:54:49 +0000 (15:54 +0000)]
Merge "Make getText hidden and getWidth/getBounds public" into pi-dev
Mikhail Naganov [Tue, 3 Apr 2018 15:53:40 +0000 (15:53 +0000)]
Merge "AudioSystem: Add log for failed commands"
Nicolas Geoffray [Tue, 3 Apr 2018 15:51:56 +0000 (16:51 +0100)]
Add com.android.development to the package whitelist.
bug:
77477866
Test: m
Change-Id: I9ac27dd3e7ee0d764d61ab9a8d2ae1065ce151e5
Evan Laird [Tue, 3 Apr 2018 15:48:10 +0000 (08:48 -0700)]
Merge "Icon updates (1 of many)" into pi-dev am:
a583d12f3d
am:
20be1388c7
Change-Id: I05b3e5a4ea7a179b559a88e49ba00599e9b53aec
Evan Laird [Tue, 3 Apr 2018 15:36:51 +0000 (08:36 -0700)]
Merge "Icon updates (1 of many)" into pi-dev
am:
a583d12f3d
Change-Id: Ib9b7b0bd3a58f601224bb1a47c3e05b7fcf51892
TreeHugger Robot [Tue, 3 Apr 2018 15:21:32 +0000 (15:21 +0000)]
Merge "Icon updates (1 of many)" into pi-dev
Leon Scroggins [Tue, 3 Apr 2018 15:12:58 +0000 (08:12 -0700)]
Merge "Update javadocs for ImageDecoder and related" into pi-dev am:
8880a9e0b9
am:
de054456f2
Change-Id: I69f828620f62848193dc14850c07ad87c20ded49
Amin Shaikh [Tue, 3 Apr 2018 15:02:50 +0000 (08:02 -0700)]
Merge "QS tile transition fixes." into pi-dev am:
600fe676f7
am:
959986325c
Change-Id: I6ba5b08e69c00ad456de9a84dbfd46256d59e6e2
Leon Scroggins [Tue, 3 Apr 2018 14:58:37 +0000 (07:58 -0700)]
Merge "Update javadocs for ImageDecoder and related" into pi-dev
am:
8880a9e0b9
Change-Id: I6dbd77cf51710d17bf0aefed453dd269e3abe1f5
Amin Shaikh [Tue, 3 Apr 2018 14:56:53 +0000 (07:56 -0700)]
Merge "Fix strings for QS header status." into pi-dev am:
bb5b42eee7
am:
5bdd3d0c67
Change-Id: I0ad901d762032da08b66c1398c34fb21445df974
Amin Shaikh [Tue, 3 Apr 2018 14:48:59 +0000 (07:48 -0700)]
Merge "QS tile transition fixes." into pi-dev
am:
600fe676f7
Change-Id: I938f26819970763dd65474167e8e6bee423da925
Amin Shaikh [Tue, 3 Apr 2018 14:43:07 +0000 (07:43 -0700)]
Merge "Fix strings for QS header status." into pi-dev
am:
bb5b42eee7
Change-Id: I6976723201ff21843e12910a818bd20b2188e257
Leon Scroggins [Tue, 3 Apr 2018 14:43:01 +0000 (14:43 +0000)]
Merge "Update javadocs for ImageDecoder and related" into pi-dev
TreeHugger Robot [Tue, 3 Apr 2018 14:30:10 +0000 (14:30 +0000)]
Merge "QS tile transition fixes." into pi-dev
TreeHugger Robot [Tue, 3 Apr 2018 14:27:32 +0000 (14:27 +0000)]
Merge "Fix strings for QS header status." into pi-dev
Artem Iglikov [Tue, 3 Apr 2018 14:05:01 +0000 (07:05 -0700)]
Merge "Greylist AccessibilityInteractionClient methods" into pi-dev am:
d33b958ca0
am:
8d438d9fd7
Change-Id: I802f02b154f961ba2433f9ed1cfb898c924dab6c
Artem Iglikov [Tue, 3 Apr 2018 13:55:22 +0000 (06:55 -0700)]
Merge "Greylist AccessibilityInteractionClient methods" into pi-dev
am:
d33b958ca0
Change-Id: I1b8f0255e70ae79fa1ffb7cb8c36f4c47ec19aed
TreeHugger Robot [Tue, 3 Apr 2018 13:42:42 +0000 (13:42 +0000)]
Merge "Greylist AccessibilityInteractionClient methods" into pi-dev
TreeHugger Robot [Tue, 3 Apr 2018 13:42:15 +0000 (13:42 +0000)]
Merge "Camera: update tonemap image in html doc"
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
Artem Iglikov [Tue, 3 Apr 2018 11:57:26 +0000 (12:57 +0100)]
Greylist AccessibilityInteractionClient methods
These are used to clear accessibility cache in tests driven by
UIAutomator.
Bug:
77401534
Test: n/a
Change-Id: Id0bb808e94e0efdd8ddc59f94ddd5ea71394c8a2
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
OSDN Git Service
