OSDN Git Service
Steven Moreland [Tue, 17 Jul 2018 17:11:34 +0000 (10:11 -0700)]
libmedia2_jni: use libbinder as shared library
In order to prevent prebuilts from freezing the libbinder
internal API (the wire protocol), it is being made a
shared-only library.
Bug:
111454508
Test: m only
Change-Id: If7f8bd931dae5310eda6c230f20179418c2efa43
(cherry picked from commit
a192e0e31400ac5a2b9d69788c7a60a89fb6c6ed)
Merged-In: If7f8bd931dae5310eda6c230f20179418c2efa43
Fredrik Roubert [Wed, 18 Jul 2018 16:29:20 +0000 (09:29 -0700)]
Merge "API updated for ICU4J 62.1" am:
e0ec160120
am:
46c84f53a6
Change-Id: Iea40f55aecdf1f469eeca68570087ccc66ce23c7
eddy-sh.chen [Wed, 18 Jul 2018 16:19:01 +0000 (09:19 -0700)]
[automerger skipped] Merge "[DO NOT MERGE] Do not dismiss volume dialog onAnimationEnd while dialog is showing" am:
2e08b42aff -s ours
am:
369f587942 -s ours
Change-Id: Ie55857ab5d91d5ffd6d488a45f9859ec9cfbbe9f
Fredrik Roubert [Wed, 18 Jul 2018 16:18:46 +0000 (09:18 -0700)]
Merge "API updated for ICU4J 62.1"
am:
e0ec160120
Change-Id: I19144ce1a0fd7d0a9781a71ebacec033a8affb19
eddy-sh.chen [Wed, 18 Jul 2018 16:14:47 +0000 (09:14 -0700)]
[automerger skipped] Merge "[DO NOT MERGE] Do not dismiss volume dialog onAnimationEnd while dialog is showing"
am:
2e08b42aff -s ours
Change-Id: Ia000091649425fa1d1a2895ecc6a7f0f96157337
Treehugger Robot [Wed, 18 Jul 2018 15:03:59 +0000 (15:03 +0000)]
Merge "API updated for ICU4J 62.1"
Treehugger Robot [Wed, 18 Jul 2018 14:59:20 +0000 (14:59 +0000)]
Merge "[DO NOT MERGE] Do not dismiss volume dialog onAnimationEnd while dialog is showing"
David Brazdil [Wed, 18 Jul 2018 13:14:52 +0000 (06:14 -0700)]
[automerger skipped] Merge "[DO NOT MERGE] Update P light greylist in AOSP" am:
21593137ac -s ours
am:
2abea6bc94 -s ours
Change-Id: Ifc02a70713a1dcaad612ec99684b60ce9dc12c7c
David Brazdil [Wed, 18 Jul 2018 13:10:27 +0000 (06:10 -0700)]
[automerger skipped] Merge "[DO NOT MERGE] Update P light greylist in AOSP"
am:
21593137ac -s ours
Change-Id: I8bb94ce755d710460fcd74d2f8d4ab0d198ba533
Fredrik Roubert [Tue, 5 Jun 2018 04:28:49 +0000 (21:28 -0700)]
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
Jorim Jaggi [Wed, 18 Jul 2018 12:09:42 +0000 (05:09 -0700)]
Merge "Repin home once setup is complete" into pi-dev
am:
31e9d9d32b
Change-Id: Iab49d0893ae591c78334a49c33f153ecab3f0239
Jorim Jaggi [Wed, 18 Jul 2018 11:57:08 +0000 (11:57 +0000)]
Merge "Repin home once setup is complete" into pi-dev
David Brazdil [Wed, 18 Jul 2018 11:49:00 +0000 (11:49 +0000)]
Merge "[DO NOT MERGE] Update P light greylist in AOSP"
David Brazdil [Wed, 18 Jul 2018 09:29:10 +0000 (10:29 +0100)]
[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
eddy-sh.chen [Mon, 16 Jul 2018 06:12:04 +0000 (14:12 +0800)]
[DO NOT MERGE] Do not dismiss volume dialog onAnimationEnd while dialog is showing
Bug:
80362864
Bug:
111478851
Change-Id: Iec6e27285bf35238d378e6561896f1d0b303fa24
Amith Yamasani [Wed, 18 Jul 2018 01:13:38 +0000 (18:13 -0700)]
Merge "Fix for incorrect cycle evaluation in computeOomAdj DO NOT MERGE" into pi-dev
am:
9d77aaec85
Change-Id: Ie4e65d42c44a2a45418f5bd27155efc6c4869276
TreeHugger Robot [Wed, 18 Jul 2018 00:56:18 +0000 (00:56 +0000)]
Merge "Fix for incorrect cycle evaluation in computeOomAdj DO NOT MERGE" into pi-dev
Tyler Gunn [Tue, 17 Jul 2018 22:26:49 +0000 (15:26 -0700)]
[automerger skipped] Merge "Ensure Notification re-post with setOnlyAlertOnce(true) silences sound." am:
bbe8990162 -s ours
am:
9bc17a66e6
Change-Id: I3bd5ec5a2867f02f02fdbb906bc2323e8724c6e6
Tyler Gunn [Tue, 17 Jul 2018 22:16:41 +0000 (15:16 -0700)]
[automerger skipped] Merge "Ensure Notification re-post with setOnlyAlertOnce(true) silences sound."
am:
bbe8990162 -s ours
Change-Id: Ic8cd7c12d58d9f75b1d952a7e9fca6cbe3f8fb33
Jerry Zhang [Tue, 17 Jul 2018 22:00:31 +0000 (15:00 -0700)]
Merge "UsbDescriptor: Add finite timeout to control transfer" am:
20dca26f41
am:
4bff76be80
Change-Id: Ie89d8a02c4e92e4d7d2372fad29abdba0c2fc568
Jerry Zhang [Tue, 17 Jul 2018 20:59:15 +0000 (13:59 -0700)]
Merge "UsbDescriptor: Add finite timeout to control transfer"
am:
20dca26f41
Change-Id: I86a916694a497bedb7d2df8a64dd17e0e15ce332
Tyler Gunn [Tue, 17 Jul 2018 20:29:59 +0000 (20:29 +0000)]
Merge "Ensure Notification re-post with setOnlyAlertOnce(true) silences sound."
Jerry Zhang [Tue, 17 Jul 2018 19:47:29 +0000 (19:47 +0000)]
Merge "UsbDescriptor: Add finite timeout to control transfer"
Laura Davis [Tue, 17 Jul 2018 18:40:15 +0000 (11:40 -0700)]
Merge "Docs: Removed narrative content." into pi-dev
am:
b4f7c414a6
Change-Id: I9b482df22bcef0fd24f6e56e2a4718bef229f4ad
Tyler Gunn [Tue, 3 Jul 2018 19:38:49 +0000 (12:38 -0700)]
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
Laura Davis [Tue, 17 Jul 2018 18:23:09 +0000 (18:23 +0000)]
Merge "Docs: Removed narrative content." into pi-dev
John Reck [Tue, 17 Jul 2018 18:20:25 +0000 (11:20 -0700)]
[automerger skipped] Merge "Remove unneeded JNI method" am:
1febe4196e -s ours
am:
8f66efbffe -s ours
Change-Id: I463ac35b909cbc3c5b6edeba2b370d4dc233f778
John Reck [Tue, 17 Jul 2018 18:12:31 +0000 (11:12 -0700)]
[automerger skipped] Merge "Remove unneeded JNI method"
am:
1febe4196e -s ours
Change-Id: I3a366342f1a94c34e0815e5941b7b13816a637c8
Treehugger Robot [Tue, 17 Jul 2018 17:00:30 +0000 (17:00 +0000)]
Merge "Remove unneeded JNI method"
Ruchi Kandoi [Tue, 17 Jul 2018 16:41:08 +0000 (09:41 -0700)]
Merge "Hide apks not needed for a specific sku" into pi-dev
am:
776b4e2dfa
Change-Id: I1219ddda2808492d84e182c4192e4caee27ba297
Neil Fuller [Tue, 17 Jul 2018 16:32:31 +0000 (09:32 -0700)]
Merge "Track OkHttp changes" am:
0083876870
am:
7e6a128ec7
Change-Id: I8f94f0fa4e29770ccff3531a71552db230cf6bac
TreeHugger Robot [Tue, 17 Jul 2018 16:26:23 +0000 (16:26 +0000)]
Merge "Hide apks not needed for a specific sku" into pi-dev
Neil Fuller [Tue, 17 Jul 2018 16:16:15 +0000 (09:16 -0700)]
Merge "Track OkHttp changes"
am:
0083876870
Change-Id: Id872a519323e5e3237fb708fa7d2d9eeae579650
Treehugger Robot [Tue, 17 Jul 2018 13:43:10 +0000 (13:43 +0000)]
Merge "Track OkHttp changes"
Jorim Jaggi [Sun, 15 Jul 2018 12:24:38 +0000 (14:24 +0200)]
Repin home once setup is complete
On a fresh device, the home intent resovles to SetupWizard. After
setup is complete, it will resolve to the regular home app. In
order to accomodate for that, repin home app once user setup is
complete.
Test: Wipe device, complete SUW, inspect pinner
Bug:
111132016
Change-Id: I904ecd2fed26bc1a3baf45c1b54da5fc6352d773
David Brazdil [Tue, 17 Jul 2018 10:53:35 +0000 (03:53 -0700)]
Merge changes If285d71a,Iffe5be7c am:
f37950d8c3
am:
c9b5e65747
Change-Id: I047358920ecc478de076c32384390ba856bd8c99
David Brazdil [Tue, 17 Jul 2018 10:48:42 +0000 (03:48 -0700)]
[automerger skipped] [DO NOT MERGE] Revert "Build dark greylist from public + light grey API" am:
ed1f171cb9 -s ours
am:
dd540c644f -s ours
Change-Id: Ie2115a3f82b78a632dec2c85527755bcb667253a
David Brazdil [Tue, 17 Jul 2018 10:43:13 +0000 (03:43 -0700)]
Merge changes If285d71a,Iffe5be7c
am:
f37950d8c3
Change-Id: I667c07fa75e0cc5badad3f297fc14316a2acfc42
David Brazdil [Tue, 17 Jul 2018 10:37:16 +0000 (03:37 -0700)]
[automerger skipped] [DO NOT MERGE] Revert "Build dark greylist from public + light grey API"
am:
ed1f171cb9 -s ours
Change-Id: Ied01c65b3352129d1ced3e41d2ce281077c52d37
Neil Fuller [Tue, 10 Jul 2018 20:13:34 +0000 (21:13 +0100)]
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
David Brazdil [Tue, 17 Jul 2018 08:24:36 +0000 (08:24 +0000)]
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"
Mark Chien [Tue, 17 Jul 2018 07:21:09 +0000 (00:21 -0700)]
Merge "Remove SimChangeListener from Tethering" am:
6e35b2c596
am:
fbab182f44
Change-Id: I7c386065179e8eae8dff0cfbf5227eb259dbb9b9
Mark Chien [Tue, 17 Jul 2018 07:10:56 +0000 (00:10 -0700)]
Merge "Remove SimChangeListener from Tethering"
am:
6e35b2c596
Change-Id: Ie85375b760684bfeb2af0231dbe81592866a4e48
Mark Chien [Tue, 17 Jul 2018 05:49:09 +0000 (05:49 +0000)]
Merge "Remove SimChangeListener from Tethering"
Mathieu Chartier [Tue, 17 Jul 2018 01:28:55 +0000 (18:28 -0700)]
[automerger skipped] Merge "old paths contains all entries when updating" am:
600aeb124b -s ours
am:
89e9a1ad43 -s ours
Change-Id: Ie23f6aae28f3452623523855a030f6fb30a4b6fd
Mathieu Chartier [Tue, 17 Jul 2018 01:22:04 +0000 (18:22 -0700)]
[automerger skipped] Merge "old paths contains all entries when updating"
am:
600aeb124b -s ours
Change-Id: Ib77887238935225bda9457414b9ec5a41e6919d6
Hall Liu [Tue, 17 Jul 2018 00:19:57 +0000 (17:19 -0700)]
[automerger skipped] Merge "Revert "Revert "Update SubscriptionInfo o use strings for mccmnc""" am:
fce4acd679 -s ours
am:
9818f2599f -s ours
Change-Id: I72fac0c55e0175256e35a9c12fea6d39c98bf468
Hall Liu [Tue, 17 Jul 2018 00:12:05 +0000 (17:12 -0700)]
[automerger skipped] Merge "Revert "Revert "Update SubscriptionInfo o use strings for mccmnc"""
am:
fce4acd679 -s ours
Change-Id: Id43c6c5c39767964e55b40d62785e3d14d4a4828
John Reck [Tue, 7 Nov 2017 00:02:49 +0000 (16:02 -0800)]
Remove unneeded JNI method
Test: ran PFD CTS tests
Change-Id: I9a40319595c757835f7e19a50dc0311077c9e627
Merged-In: I9a40319595c757835f7e19a50dc0311077c9e627
(cherry picked from commit
d7bd9190759e3a6658455ada987453928caec8a8)
Mathieu Chartier [Mon, 16 Jul 2018 23:16:13 +0000 (23:16 +0000)]
Merge "old paths contains all entries when updating"
Laura Davis [Fri, 13 Jul 2018 22:12:35 +0000 (15:12 -0700)]
Docs: Removed narrative content.
Test: make ds-docs
Bug:
110268338
Change-Id: Ifaa4096d075500f1c7a53b1eec9e1944ed2ddda6
Hall Liu [Mon, 16 Jul 2018 22:52:10 +0000 (22:52 +0000)]
Merge "Revert "Revert "Update SubscriptionInfo o use strings for mccmnc"""
Todd Kennedy [Mon, 16 Jul 2018 21:15:09 +0000 (14:15 -0700)]
Merge "Loosen resource file verification" into pi-dev
am:
cf0b127110
Change-Id: I0b4012085579aa172a1a3f5a83325f0827523af5
Robert Shih [Mon, 16 Jul 2018 20:58:38 +0000 (13:58 -0700)]
Merge changes from topic "am-
9e4fa925-b00a-40e6-8fb0-
e5a4244e6284" into oc-dev am:
e43837e258 am:
dccb62bcca am:
64cb4be887
am:
c450d1401e
Change-Id: I7aba9ed971773ac2ea8cc7df5fe42ed9c022a5ab
TreeHugger Robot [Mon, 16 Jul 2018 20:57:43 +0000 (20:57 +0000)]
Merge "Loosen resource file verification" into pi-dev
Todd Kennedy [Thu, 12 Jul 2018 20:15:54 +0000 (13:15 -0700)]
Loosen resource file verification
Bug:
77808145
Test: Tried to install corrupt APK prior to the change, install failed
Test: Tried to install corrupt APK after the change, install succeeded
Test: atest CtsAppSecurityHostTestCases:CorruptApkTests
Change-Id: I19a69e52a17c1080beaf2cc575c32f564b1033a3
Robert Shih [Mon, 16 Jul 2018 20:38:43 +0000 (13:38 -0700)]
Merge changes from topic "am-
9e4fa925-b00a-40e6-8fb0-
e5a4244e6284" into oc-dev am:
e43837e258 am:
dccb62bcca
am:
64cb4be887
Change-Id: Id7d4599c5d7d7c803e86afa88be582773c80741f
Amith Yamasani [Mon, 16 Jul 2018 20:38:23 +0000 (13:38 -0700)]
Merge "Fix crash on calling getAppStandbyBucket()" into pi-dev
am:
632c036d8c
Change-Id: I1f76c36d330c50b17fc6df35ffb014e3e97e3640
Robert Shih [Mon, 16 Jul 2018 20:13:13 +0000 (13:13 -0700)]
Merge changes from topic "am-
9e4fa925-b00a-40e6-8fb0-
e5a4244e6284" into oc-dev am:
e43837e258
am:
dccb62bcca
Change-Id: I9e6762b25f001e31da7df0bb25984856989b9fd9
TreeHugger Robot [Mon, 16 Jul 2018 20:04:23 +0000 (20:04 +0000)]
Merge "Fix crash on calling getAppStandbyBucket()" into pi-dev
Robert Shih [Mon, 16 Jul 2018 19:51:28 +0000 (12:51 -0700)]
Merge changes from topic "am-
9e4fa925-b00a-40e6-8fb0-
e5a4244e6284" into oc-dev
am:
e43837e258
Change-Id: Ib0ef741f0188ff3e6edc52e20eae997e9dba56e4
Chong Zhang [Mon, 16 Jul 2018 19:25:32 +0000 (12:25 -0700)]
Merge "Fix broken javadoc link in MediaFormat" into pi-dev
am:
15ae72085f
Change-Id: Id7af6bea28f60e93ce1a1cce94f053b9484ceb37
TreeHugger Robot [Mon, 16 Jul 2018 19:25:14 +0000 (19:25 +0000)]
Merge changes from topic "am-
9e4fa925-b00a-40e6-8fb0-
e5a4244e6284" into oc-dev
* changes:
[automerger] Fix TrackInfo parcel write am:
0d2dc943dc am:
00b57fc9b7 am:
1bce1217ca am:
47c831e675 am:
d6143e9307
[automerger] Fix TrackInfo parcel write am:
0d2dc943dc am:
00b57fc9b7 am:
1bce1217ca am:
47c831e675
[automerger] Fix TrackInfo parcel write am:
0d2dc943dc am:
00b57fc9b7 am:
1bce1217ca
[automerger] Fix TrackInfo parcel write am:
0d2dc943dc am:
00b57fc9b7
[automerger] Fix TrackInfo parcel write am:
0d2dc943dc
Fix TrackInfo parcel write
Chong Zhang [Mon, 16 Jul 2018 19:12:32 +0000 (19:12 +0000)]
Merge "Fix broken javadoc link in MediaFormat" into pi-dev
Todd Kennedy [Wed, 2 May 2018 09:59:45 +0000 (10:59 +0100)]
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
markchien [Mon, 16 Jul 2018 11:54:26 +0000 (19:54 +0800)]
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
Neil Fuller [Mon, 16 Jul 2018 08:58:14 +0000 (01:58 -0700)]
Merge "Avoid use of DateUtilsBridge.icuTimeZone()" am:
e859c42e23
am:
25fd54f6f3
Change-Id: I0083ddcadbc391a26ae8d264f8626bdf3b8f988f
Neil Fuller [Mon, 16 Jul 2018 08:50:04 +0000 (01:50 -0700)]
Merge "Avoid use of DateUtilsBridge.icuTimeZone()"
am:
e859c42e23
Change-Id: I6b6452f9609d88ce61959e7c4ae4f0fd8fa97e64
Neil Fuller [Mon, 16 Jul 2018 07:44:58 +0000 (07:44 +0000)]
Merge "Avoid use of DateUtilsBridge.icuTimeZone()"
Jack Yu [Mon, 16 Jul 2018 02:47:08 +0000 (19:47 -0700)]
Merge "Added documentation for network registration state" am:
3c1604da8b
am:
5e7bbe01c4
Change-Id: I3a24338b43b6f1f9a704bbed1e2d472bb2a9c574
Jack Yu [Sat, 9 Jun 2018 00:27:05 +0000 (17:27 -0700)]
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)
(cherry picked from commit
d6284d9e0a22de09eb07ee00567cec5e7b01b433)
Jack Yu [Mon, 16 Jul 2018 00:12:41 +0000 (17:12 -0700)]
Merge "Added documentation for network registration state"
am:
3c1604da8b
Change-Id: Icf8f0fff21c1190d3bde21cdbe378d6b75b51506
Treehugger Robot [Sun, 15 Jul 2018 22:34:30 +0000 (22:34 +0000)]
Merge "Added documentation for network registration state"
Chih-hung Hsieh [Sat, 14 Jul 2018 04:23:02 +0000 (21:23 -0700)]
Merge "Fix unnecessary copy initialization warnings" am:
38858d6dd3
am:
d5de710016
Change-Id: Ie86ab05432cfde69464cfeb3341248dd6b18675e
Chih-hung Hsieh [Sat, 14 Jul 2018 04:13:18 +0000 (21:13 -0700)]
Merge "Fix unnecessary copy initialization warnings"
am:
38858d6dd3
Change-Id: Ic96829517269abfdb9fbf1661deffe0758356d57
Jack Yu [Sat, 14 Jul 2018 04:09:56 +0000 (21:09 -0700)]
[automerger skipped] Reordered the params for network registration
am:
d6284d9e0a -s ours
Change-Id: I29fc2270df41e5c401d78820feb92dce4f015bba
Hall Liu [Sat, 14 Jul 2018 00:30:49 +0000 (00:30 +0000)]
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
Nathan Harold [Sat, 14 Jul 2018 00:30:59 +0000 (17:30 -0700)]
Merge "Re-Number RIL Message IDs to Match RIL.h" am:
8424001a04
am:
f448662744
Change-Id: I98eb865f45fd608d4d8f73ce3bc8a9afa26bd2d2
Jack Yu [Sat, 9 Jun 2018 00:27:05 +0000 (17:27 -0700)]
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)
Tyler Gunn [Sat, 14 Jul 2018 00:20:45 +0000 (17:20 -0700)]
Merge "Update InCallService API docs to explain how to show incoming call UI." am:
ac47c63b36
am:
0bd810f5ea
Change-Id: I649bdb38348a507c5c01d66d99df0c6d6f5dcd6f
Jorim Jaggi [Sat, 14 Jul 2018 00:13:14 +0000 (17:13 -0700)]
Merge "Pin compiled code of HOME app" into pi-dev
am:
0e5e46f874
Change-Id: I205971bc6c8309fc4ad40b4a4677703adecf4a75
Nathan Harold [Fri, 13 Jul 2018 22:45:31 +0000 (15:45 -0700)]
Merge "Re-Number RIL Message IDs to Match RIL.h"
am:
8424001a04
Change-Id: I5d284e48bbc2c9c461004f521bd719a490b9fed9
Chih-hung Hsieh [Fri, 13 Jul 2018 22:42:26 +0000 (22:42 +0000)]
Merge "Fix unnecessary copy initialization warnings"
Tyler Gunn [Fri, 13 Jul 2018 22:37:40 +0000 (15:37 -0700)]
Merge "Update InCallService API docs to explain how to show incoming call UI."
am:
ac47c63b36
Change-Id: I4b3f34199c471006c71c2560f365ad314580b0a3
Jorim Jaggi [Fri, 13 Jul 2018 22:36:08 +0000 (22:36 +0000)]
Merge "Pin compiled code of HOME app" into pi-dev
Jack Yu [Wed, 6 Jun 2018 00:38:56 +0000 (17:38 -0700)]
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)
Chih-Hung Hsieh [Fri, 13 Jul 2018 20:37:03 +0000 (13:37 -0700)]
Fix unnecessary copy initialization warnings
Bug:
30413862
Test: build with WITH_TIDY=1
Change-Id: I333d3a6b3394f50712148eeabf2253f1e01b21f3
Jack Yu [Fri, 13 Jul 2018 20:06:31 +0000 (13:06 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Revert "Hide IWLAN system API"" into stage-aosp-master
am:
1bee26f4c3 -s ours
Change-Id: I236396a3080e5b435db417ba2ed10485232976ec
Nathan Harold [Fri, 13 Jul 2018 19:57:06 +0000 (19:57 +0000)]
Merge "Re-Number RIL Message IDs to Match RIL.h"
Tyler Gunn [Fri, 13 Jul 2018 19:45:28 +0000 (12:45 -0700)]
Merge "Make Connection#onSilence a public API." am:
cbe3737f13
am:
01ab0b90bf
Change-Id: I8c011d4a495d5240ebec83b07bc0b8f57a3c40ac
Yueming Wang [Fri, 13 Jul 2018 19:36:51 +0000 (12:36 -0700)]
[automerger skipped] Merge "Revert "Update SubscriptionInfo o use strings for mccmnc"" am:
f92ad05fa5 -s ours
am:
6dd8f735d2 -s ours
Change-Id: I6cb9a490d20e71432ea7f6afd87ae58a5570d34e
Android Build Merger (Role) [Fri, 13 Jul 2018 19:30:22 +0000 (19:30 +0000)]
Merge "Merge "docs: Fixed typos in AdapterView Javadoc." into pi-dev am:
9ef41ccf42" into pi-dev-plus-aosp
Shrijana Ghimire [Fri, 13 Jul 2018 19:29:55 +0000 (12:29 -0700)]
Merge "docs: Fixed typos in AdapterView Javadoc." into pi-dev
am:
9ef41ccf42
Change-Id: I03291b3758127de3bfef480a6561930f5901014c
Jack Yu [Fri, 13 Jul 2018 19:28:23 +0000 (19:28 +0000)]
Merge "DO NOT MERGE - Revert "Hide IWLAN system API"" into stage-aosp-master
Jack Yu [Fri, 13 Jul 2018 19:28:11 +0000 (19:28 +0000)]
Merge "DO NOT MERGE - Revert "Hide IWLAN system API"" into pi-dev-plus-aosp
Tyler Gunn [Fri, 13 Jul 2018 19:15:45 +0000 (12:15 -0700)]
Merge "Make Connection#onSilence a public API."
am:
cbe3737f13
Change-Id: I4ab192ca160219770d7384e88c8e0025137b42bd
Yueming Wang [Fri, 13 Jul 2018 19:10:40 +0000 (12:10 -0700)]
[automerger skipped] Merge "Revert "Update SubscriptionInfo o use strings for mccmnc""
am:
f92ad05fa5 -s ours
Change-Id: If211a292335419751be21e670b1ddb489d3c54b4
Bill Yi [Fri, 13 Jul 2018 19:08:05 +0000 (12:08 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
762470b663 -s ours
Change-Id: If96f549175221087b8e5942ff286928b1bcb7f22
Shrijana Ghimire [Fri, 13 Jul 2018 19:03:24 +0000 (19:03 +0000)]
Merge "docs: Fixed typos in AdapterView Javadoc." into pi-dev
Neil Fuller [Fri, 13 Jul 2018 18:49:51 +0000 (19:49 +0100)]
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
OSDN Git Service
