345163 Commits

Author SHA1 Message Date
Andreas Gampe
7e9236873c Frameworks: Let GuardedBy accept multiple locks
Widen the definition to take advantage of errorprone support.

Bug: 72666911
Test: m
Test: m RUN_ERROR_PRONE=true javac-check
Change-Id: Id792ee70b41b786da717f916e143786fe6308937
2018-07-19 08:12:43 -07:00
Treehugger Robot
e0ec160120 Merge "API updated for ICU4J 62.1" 2018-07-18 15:03:59 +00:00
Treehugger Robot
2e08b42aff Merge "[DO NOT MERGE] Do not dismiss volume dialog onAnimationEnd while dialog is showing" 2018-07-18 14:59:20 +00:00
Fredrik Roubert
9182e410ce API updated for ICU4J 62.1
- ICU 62 upgrades to Unicode 11. Add new APIs for Unicode 11.0

Bug: 109930825
Bug: 109837373
Test: make
Change-Id: I3f23bbe624a10511a613cb07fd35e8272d1461a2
2018-07-18 13:00:03 +00:00
David Brazdil
21593137ac Merge "[DO NOT MERGE] Update P light greylist in AOSP" 2018-07-18 11:49:00 +00:00
David Brazdil
cb1f5bc41e [DO NOT MERGE] Update P light greylist in AOSP
Publish the final light greylist of P for external developers.

Test: N/A
Change-Id: I5513ee2ee555bf1dced7f52b36de3df7ac85747a
2018-07-18 11:20:07 +00:00
eddy-sh.chen
bfc28a4348 [DO NOT MERGE] Do not dismiss volume dialog onAnimationEnd while dialog is showing
Bug: 80362864
Bug: 111478851

Change-Id: Iec6e27285bf35238d378e6561896f1d0b303fa24
2018-07-18 01:49:02 +00:00
Tyler Gunn
bbe8990162 Merge "Ensure Notification re-post with setOnlyAlertOnce(true) silences sound." 2018-07-17 20:29:59 +00:00
Jerry Zhang
20dca26f41 Merge "UsbDescriptor: Add finite timeout to control transfer" 2018-07-17 19:47:29 +00:00
Tyler Gunn
d8e8c8b21b Ensure Notification re-post with setOnlyAlertOnce(true) silences sound.
Where a notification channel has an associated looping sound, it should
be possible to re-post the notification with setOnlyAlertOnce(true) to
cause the notification channel's sound to silence.

When re-posting the notification, this CL fixes an issue where
NotificationManagerService wouldn't call clearSoundLocked to stop playing
the sound, resulting in the notification continuing to playing the sound
associated with the notification channel.

Test: Manual testing, updated unit test
Bug: 110348674
Merged-In: I3ec26f0804bcf59f7356a2329b73ba8ed8f7ea51
Change-Id: I3ec26f0804bcf59f7356a2329b73ba8ed8f7ea51
2018-07-17 18:23:22 +00:00
Treehugger Robot
1febe4196e Merge "Remove unneeded JNI method" 2018-07-17 17:00:30 +00:00
Treehugger Robot
0083876870 Merge "Track OkHttp changes" 2018-07-17 13:43:10 +00:00
Neil Fuller
cfa116949b Track OkHttp changes
As part of creating a full facade over OkHttp code there
are some changes to OkHttp-related classes that must be tracked.
See the related external/okhttp commit for details.

Some non-functional lint / WS changes have been made as part of this
change.

Test: Ran CtsLibcoreOkHttpTestCases entirely
Test: Ran CtsLibcoreTestCases entirely
Test: run cts-dev -m CtsNetTestCases -t android.net.http.cts.HttpResponseCacheTest
Bug: 111055375
Change-Id: I0b0ec21fa376ea33e2fa5486e203e92d3c3337cf
2018-07-17 10:48:15 +01: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
6e35b2c596 Merge "Remove SimChangeListener from Tethering" 2018-07-17 05:49:09 +00:00
John Reck
107e6f2f53 Remove unneeded JNI method
Test: ran PFD CTS tests
Change-Id: I9a40319595c757835f7e19a50dc0311077c9e627
Merged-In: I9a40319595c757835f7e19a50dc0311077c9e627
(cherry picked from commit d7bd9190759e3a6658455ada987453928caec8a8)
2018-07-16 16:32:38 -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
e859c42e23 Merge "Avoid use of DateUtilsBridge.icuTimeZone()" 2018-07-16 07:44:58 +00:00
Treehugger Robot
3c1604da8b Merge "Added documentation for network registration state" 2018-07-15 22:34:30 +00: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
Chih-hung Hsieh
38858d6dd3 Merge "Fix unnecessary copy initialization warnings" 2018-07-13 22:42:26 +00: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
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
Hall Liu
0babf1815c Merge "Update SubscriptionInfo o use strings for mccmnc" 2018-07-12 21:13:16 +00: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
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
Jack Yu
c51397b161 Merge "Added documentation for network registration state" 2018-07-12 02:28:32 +00:00
Treehugger Robot
57df2a333f Merge "Add Channel 50 (area update info) support for LAM market" 2018-07-11 21:52:01 +00:00
Treehugger Robot
1918b39942 Merge "Disable LTO on -eng" 2018-07-11 20:21:19 +00:00
John Reck
2729418128 Disable LTO on -eng
Speeds up incremental compile of one cpp file change
from over a minute to around 15 seconds

Bug: 111277863
Test: touch a .cpp file in hwui & mmm
Change-Id: I946ecad411a7a59f87ed9e1eeb146d6f57bd038a
2018-07-11 18:24:58 +00:00
Jack Yu
b4094993f7 Added documentation for network registration state
Also renamed denial reason to reject cause to match
the 3GPP spec.

Bug: 73659459
Test: Build
Change-Id: Ia7b4a53070c06edd98ae767fd6f56c4000d8e4d0
2018-07-11 11:08:48 -07:00
Nathan Harold
c1e5c3ea82 Merge "Update Wcdma and Tdscdma CellInfo for HAL 1.2" 2018-07-11 17:58:50 +00:00
Tyler Gunn
06f0616f6d Make Connection#onSilence a public API.
Connection#onSilence is generally applicable to apps implementing the
self-managed ConnectionService API.
Also updated the docs to make it more clear where that API is to be used
and how the developer can silence the ringtone.

Test: CTS test, manual test.
Bug: 110348674
Change-Id: I1c1791c101827780949fd633c531ed83037e7b4e
2018-07-11 09:04:43 -07:00
Neil Fuller
f4634736ca Move XML object factory logic to libcore
It makes sense to hide the details of the parser implementation
(and other similar objects) in libcore so it could be changed.

This change removes the "ExpatPerformanceTest" which appears not to have
been maintained and was comparing KxmlParser with itself. It is assumed
that android.util.Xml used to return the expat parser.

Test: build
Bug: 111055375
Merged-In: Ibad247323ba90cd949aecb2bd92f2f73306a4327
Change-Id: Ibad247323ba90cd949aecb2bd92f2f73306a4327
2018-07-11 14:02:00 +01:00