373944 Commits

Author SHA1 Message Date
David Brazdil
c9b5e65747 Merge changes If285d71a,Iffe5be7c
am: f37950d8c3

Change-Id: I667c07fa75e0cc5badad3f297fc14316a2acfc42
2018-07-17 03:43:13 -07:00
David Brazdil
dd540c644f [automerger skipped] [DO NOT MERGE] Revert "Build dark greylist from public + light grey API"
am: ed1f171cb9  -s ours

Change-Id: Ied01c65b3352129d1ced3e41d2ce281077c52d37
2018-07-17 03:37:16 -07:00
David Brazdil
f37950d8c3 Merge changes If285d71a,Iffe5be7c
* changes:
  Revert^2: Build dark greylist from public + light grey API
  [DO NOT MERGE] Revert "Build dark greylist from public + light grey API"
2018-07-17 08:24:36 +00:00
Mark Chien
fbab182f44 Merge "Remove SimChangeListener from Tethering"
am: 6e35b2c596

Change-Id: Ie85375b760684bfeb2af0231dbe81592866a4e48
2018-07-17 00:10:56 -07:00
Mark Chien
6e35b2c596 Merge "Remove SimChangeListener from Tethering" 2018-07-17 05:49:09 +00:00
Mathieu Chartier
89e9a1ad43 [automerger skipped] Merge "old paths contains all entries when updating"
am: 600aeb124b  -s ours

Change-Id: Ib77887238935225bda9457414b9ec5a41e6919d6
2018-07-16 18:22:04 -07:00
Hall Liu
9818f2599f [automerger skipped] Merge "Revert "Revert "Update SubscriptionInfo o use strings for mccmnc"""
am: fce4acd679  -s ours

Change-Id: Id43c6c5c39767964e55b40d62785e3d14d4a4828
2018-07-16 17:12:05 -07:00
Mathieu Chartier
600aeb124b Merge "old paths contains all entries when updating" 2018-07-16 23:16:13 +00:00
Hall Liu
fce4acd679 Merge "Revert "Revert "Update SubscriptionInfo o use strings for mccmnc""" 2018-07-16 22:52:10 +00:00
Todd Kennedy
4cfaa2ebdb old paths contains all entries when updating
In certains circumstances, only the base and split APKs were included in
the "old paths" list when updating the application info. Instead, this
list should contain _all_ elements, including any additional libraries
that may be added to the overall classpath.

Bug: 77342775
Bug: 80337129

Test: Manual. Install a package. Install a split with --dont_kill. See that the path doesn't contain duplicate entries
Test: Uninstall GMS updates and reinstall. Verify that GMS Dex files aren't extrated out of the APK.

(cherry picked from commit b9656a93aac435cefaa4ca0e1b06495d690ba019)

Merged-In: Id9739cce215ab07bff1b17966583c0cf51a0b34a
Change-Id: I3c61b1b61dc1ab8a1a51a5be68f19ae9af586692
2018-07-16 11:37:02 -07:00
markchien
1d64e03f91 Remove SimChangeListener from Tethering
SimChangeListener is obsolete. It is replace by
ACTION_CARRIER_CONFIG_CHANGED.

Test: as follows
    - built, flashed, booted
    - runtest frameworks-net passes (with --no-hidden-api-checks)
    - tethering/hotspot on/off
Bug: 111490073

Change-Id: I82644ea136f43869a953a1f7b72dc489fe90f380
2018-07-16 19:54:26 +08:00
Neil Fuller
25fd54f6f3 Merge "Avoid use of DateUtilsBridge.icuTimeZone()"
am: e859c42e23

Change-Id: I6b6452f9609d88ce61959e7c4ae4f0fd8fa97e64
2018-07-16 01:50:04 -07:00
Neil Fuller
e859c42e23 Merge "Avoid use of DateUtilsBridge.icuTimeZone()" 2018-07-16 07:44:58 +00:00
Jack Yu
5e7bbe01c4 Merge "Added documentation for network registration state"
am: 3c1604da8b

Change-Id: Icf8f0fff21c1190d3bde21cdbe378d6b75b51506
2018-07-15 17:12:41 -07:00
Treehugger Robot
3c1604da8b Merge "Added documentation for network registration state" 2018-07-15 22:34:30 +00:00
Chih-hung Hsieh
d5de710016 Merge "Fix unnecessary copy initialization warnings"
am: 38858d6dd3

Change-Id: Ic96829517269abfdb9fbf1661deffe0758356d57
2018-07-13 21:13:18 -07:00
Hall Liu
79b6840516 Revert "Revert "Update SubscriptionInfo o use strings for mccmnc""
This reverts commit 0082b161ca42b41925fd5973f1779fc4c46f6034.

Reason for revert: build breaks fixed

Change-Id: I75ea63ceaae6e970ce51a971c9a4635d0ce3f9e4
Merged-In: I45c0bfefb7ffe98e3eab8e68d0e1170881ae9f4c
2018-07-14 00:32:56 +00:00
Jack Yu
d6284d9e0a Reordered the params for network registration
Test: Build
Bug: 73659459
Merged-In: I1af2c49a937177173b760d30b030da20f03c01d7
Change-Id: I1af2c49a937177173b760d30b030da20f03c01d7
(cherry picked from commit 7928c4d1c370a67be81ccb5b70696b8ef9db48ba)
(cherry picked from commit c683c3930e6d03825fd80fa71a2b3d5de5639f7d)
2018-07-14 00:30:29 +00:00
Nathan Harold
f448662744 Merge "Re-Number RIL Message IDs to Match RIL.h"
am: 8424001a04

Change-Id: I5d284e48bbc2c9c461004f521bd719a490b9fed9
2018-07-13 15:45:31 -07:00
Chih-hung Hsieh
38858d6dd3 Merge "Fix unnecessary copy initialization warnings" 2018-07-13 22:42:26 +00:00
Tyler Gunn
0bd810f5ea Merge "Update InCallService API docs to explain how to show incoming call UI."
am: ac47c63b36

Change-Id: I4b3f34199c471006c71c2560f365ad314580b0a3
2018-07-13 15:37:40 -07:00
Jack Yu
b494f72750 Added documentation for network registration state
Also renamed denial reason to reject cause to match
the 3GPP spec.

Bug: 73659459
Test: Build
Change-Id: Ia67ebf94771c7ff5f5d90f6cdd303cb2716f9186
(cherry picked from commit b4094993f742fbe9d07bd5783030aa82a3045f79)
2018-07-13 14:50:02 -07:00
Chih-Hung Hsieh
c134063ab8 Fix unnecessary copy initialization warnings
Bug: 30413862
Test: build with WITH_TIDY=1
Change-Id: I333d3a6b3394f50712148eeabf2253f1e01b21f3
2018-07-13 13:37:03 -07:00
Nathan Harold
8424001a04 Merge "Re-Number RIL Message IDs to Match RIL.h" 2018-07-13 19:57:06 +00:00
Jack Yu
1bee26f4c3 Merge "DO NOT MERGE - Revert "Hide IWLAN system API"" into stage-aosp-master 2018-07-13 19:28:23 +00:00
Tyler Gunn
01ab0b90bf Merge "Make Connection#onSilence a public API."
am: cbe3737f13

Change-Id: I4ab192ca160219770d7384e88c8e0025137b42bd
2018-07-13 12:15:45 -07:00
Yueming Wang
6dd8f735d2 [automerger skipped] Merge "Revert "Update SubscriptionInfo o use strings for mccmnc""
am: f92ad05fa5  -s ours

Change-Id: If211a292335419751be21e670b1ddb489d3c54b4
2018-07-13 12:10:40 -07:00
Neil Fuller
6d5c4a8d8d Avoid use of DateUtilsBridge.icuTimeZone()
DateUtilsBridge is only used in one place in framework.
The usage is avoidable by sticking to java.util. This
decreases the number of non-public libcore classes in
use by framework.

Test: build
Bug: 111055375
Change-Id: Ifd6576b5b6df1e154f16ec201a4575d0b95de66d
2018-07-13 19:54:29 +01:00
Treehugger Robot
ac47c63b36 Merge "Update InCallService API docs to explain how to show incoming call UI." 2018-07-13 18:52:52 +00:00
Tyler Gunn
cbe3737f13 Merge "Make Connection#onSilence a public API." 2018-07-13 17:02:36 +00:00
Treehugger Robot
f92ad05fa5 Merge "Revert "Update SubscriptionInfo o use strings for mccmnc"" 2018-07-13 16:34:30 +00:00
David Brazdil
5f881b25b5 Revert^2: Build dark greylist from public + light grey API
The dark greylist is meant to contain non-SDK APIs which are "related"
to APIs accessible to apps without restrictions. The list used to be
built as all non-SDK APIs in the same package as those on the light
greylist. That is not sufficient and should include the public SDK API
packages too.

This patch modifies the makefile to generate a list of public API DEX
signatures with Doclava and then use that as a basis for the dark
greylist generation.

Bug: 80461842
Bug: 64382372
Test: make out/target/common/obj/PACKAGING/hiddenapi-blacklist.txt
Change-Id: If285d71ab82c3046fca94c325d664bd9073c1a69
2018-07-13 15:46:24 +01:00
David Brazdil
ed1f171cb9 [DO NOT MERGE] Revert "Build dark greylist from public + light grey API"
This reverts commit 6f6a126b9c64e49abcabcb6ea7b563535d22b04e.

Reason for revert: Bad merge into internal

Change-Id: Iffe5be7c10e8438bd46f71dc22e0867c0d316d40
2018-07-13 15:45:54 +01:00
Yueming Wang
0082b161ca Revert "Update SubscriptionInfo o use strings for mccmnc"
This reverts commit 0c149bd2d84d6e7c21dd4d7fff1e4dcfd51318f3.

Reason for revert:  reverting this topic as it breaks several branches.

Change-Id: Ia01984242e54b5db5d853135b322ebb1284a4d43
Merged-In: I45c0bfefb7ffe98e3eab8e68d0e1170881ae9f4c
2018-07-13 11:15:50 +00:00
Jack Yu
f2add90de4 DO NOT MERGE - Revert "Hide IWLAN system API"
This reverts commit ea440a765e2774320910073e5350bdccd39afb6c, reversing
changes made to 0b90c524cb8288f3b8d8111b5724c02630c5b4c6.

Test: Build
Bug: 73659459
Change-Id: Id5a5147c6478cf10661aebe52b445bd16195885e
2018-07-12 19:41:33 -07:00
Hall Liu
08a4eb9445 Merge "Update SubscriptionInfo o use strings for mccmnc"
am: 0babf1815c

Change-Id: I1833cb2d5437cccb61cc8f6dcd884a45a2b3250f
2018-07-12 15:22:52 -07:00
Jean-Michel Trivi
8df8455384 Merge "Audio assets: add NFC sounds"
am: 5cb7cd68a0

Change-Id: I84755ad470a4826879cd6c148c9a041bce6a7920
2018-07-12 14:36:35 -07:00
Hall Liu
0babf1815c Merge "Update SubscriptionInfo o use strings for mccmnc" 2018-07-12 21:13:16 +00:00
Jack Yu
2016ffc9ec [automerger skipped] Merge "Revert "Added documentation for network registration state""
am: 1cbcc50d0a  -s ours

Change-Id: I02d1877b0bd5d84895ea12590c8ea0668e0255db
2018-07-12 13:52:49 -07:00
Nathan Harold
13e47d018d Re-Number RIL Message IDs to Match RIL.h
-Renumber RIL requests to match the message IDs
 for NATT Keepalive messages.
-Update comments to indicate RIL+HAL and HAL-only
 messages.
-Add new message offsets to explicitly support
 HAL-only messages in the list.

Bug: 110181475
Test: runtest frameworks-telephony
Change-Id: I58544f9291f426b5c195ece81113e15ed423d2df
2018-07-12 13:38:20 -07:00
Jean-Michel Trivi
5cb7cd68a0 Merge "Audio assets: add NFC sounds" 2018-07-12 19:41:51 +00:00
Nathan Harold
f5f908c525 Merge "Remove Duplicate Override for Operator Alphas"
am: 24eaa6ab3d

Change-Id: I15004a7df3d922ba50d187769299723e888febae
2018-07-12 12:35:18 -07:00
Jordan Liu
e5c77fc978 Merge "WRITE_APN_SETTINGS is also required to read"
am: 0beefc0af5

Change-Id: I1ac69c71c7bdb39a9631da00a8bda89f7c1f0edd
2018-07-12 11:46:32 -07:00
Neil Fuller
7add22db60 Merge "Move XML object factory logic to libcore"
am: 8176fb99e1

Change-Id: Ib0940ecb89eaf11841bbd66cdaf1c5379466496c
2018-07-12 11:26:03 -07:00
Jack Yu
6af5ddcc4a [automerger skipped] Merge "Added documentation for network registration state"
am: c51397b161  -s ours

Change-Id: I33f775c099c949f117badea85fadaa3e5a2eec7a
2018-07-12 11:21:11 -07:00
Jack Yu
1cbcc50d0a Merge "Revert "Added documentation for network registration state"" 2018-07-12 18:16:26 +00:00
Nathan Harold
24eaa6ab3d Merge "Remove Duplicate Override for Operator Alphas" 2018-07-12 18:08:05 +00:00
Jack Yu
7e1be05b14 Revert "Added documentation for network registration state"
This reverts commit b4094993f742fbe9d07bd5783030aa82a3045f79.

Reason for revert: Caused merge conflict. Need to come up with a better solution.

Change-Id: Id7b7f35c25775a7a095b77a90724cf3a0f8daf7e
2018-07-12 17:39:12 +00:00
Jordan Liu
0beefc0af5 Merge "WRITE_APN_SETTINGS is also required to read" 2018-07-12 17:36:15 +00:00
Treehugger Robot
8176fb99e1 Merge "Move XML object factory logic to libcore" 2018-07-12 13:46:56 +00:00