OSDN Git Service
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
TreeHugger Robot [Mon, 16 Jul 2018 20:04:23 +0000 (20:04 +0000)]
Merge "Fix crash on calling getAppStandbyBucket()" into pi-dev
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
Chong Zhang [Mon, 16 Jul 2018 19:12:32 +0000 (19:12 +0000)]
Merge "Fix broken javadoc link in MediaFormat" into pi-dev
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
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
Treehugger Robot [Fri, 13 Jul 2018 18:52:52 +0000 (18:52 +0000)]
Merge "Update InCallService API docs to explain how to show incoming call UI."
TreeHugger Robot [Fri, 13 Jul 2018 18:40:05 +0000 (18:40 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Bill Yi [Fri, 13 Jul 2018 18:26:02 +0000 (11:26 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
c2f735b844 -s ours
Change-Id: Ia4f46d8b32b0158ffb8f3861399a6bd36f0d4275
TreeHugger Robot [Fri, 13 Jul 2018 18:04:45 +0000 (18:04 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Jack Yu [Fri, 13 Jul 2018 17:32:20 +0000 (10:32 -0700)]
DO NOT MERGE - Revert "Hide IWLAN system API"
This reverts commit
ea440a765e2774320910073e5350bdccd39afb6c, reversing
changes made to
0b90c524cb8288f3b8d8111b5724c02630c5b4c6.
Test: Build
Bug:
73659459
Change-Id: I2c52f17090040cea589081c3ed412a14986e3d85
Bernie Innocenti [Fri, 13 Jul 2018 17:14:24 +0000 (10:14 -0700)]
[automerger skipped] Merge "vpn: allow IPSec traffic through Always-on VPN" into oc-dev am:
8f1c70e49b am:
d1f53d13a9 -s ours am:
213af1a79e -s ours
am:
66bbd64d7d -s ours
Change-Id: I58c75d2ec05c1470cabed265fa6d4e095ff698b8
Tyler Gunn [Fri, 13 Jul 2018 17:02:36 +0000 (17:02 +0000)]
Merge "Make Connection#onSilence a public API."
Bernie Innocenti [Fri, 13 Jul 2018 16:42:28 +0000 (09:42 -0700)]
[automerger skipped] Merge "vpn: allow IPSec traffic through Always-on VPN" into oc-dev am:
8f1c70e49b am:
d1f53d13a9 -s ours
am:
213af1a79e -s ours
Change-Id: If0154030422d4ddd2b4383f9e107125d67f7b409
Treehugger Robot [Fri, 13 Jul 2018 16:34:30 +0000 (16:34 +0000)]
Merge "Revert "Update SubscriptionInfo o use strings for mccmnc""
Bernie Innocenti [Fri, 13 Jul 2018 16:28:39 +0000 (09:28 -0700)]
[automerger skipped] Merge "vpn: allow IPSec traffic through Always-on VPN" into oc-mr1-dev am:
1e5152b539 -s ours
am:
b32be39c6d -s ours
Change-Id: Ia1dfd55946842083d4e3256a51607cecf59a67b8
Bernie Innocenti [Fri, 13 Jul 2018 16:28:11 +0000 (09:28 -0700)]
[automerger skipped] Merge "vpn: allow IPSec traffic through Always-on VPN" into oc-dev am:
8f1c70e49b
am:
d1f53d13a9 -s ours
Change-Id: I293fc38d50e75b0b021dff6af045ac8a2aa6927f
Bernie Innocenti [Fri, 13 Jul 2018 16:17:40 +0000 (09:17 -0700)]
Merge "vpn: allow IPSec traffic through Always-on VPN" into oc-dev
am:
8f1c70e49b
Change-Id: Ic103dfa909ca4567a815b16f0794baf74c1cf068
Bernie Innocenti [Fri, 13 Jul 2018 16:17:17 +0000 (09:17 -0700)]
[automerger skipped] Merge "vpn: allow IPSec traffic through Always-on VPN" into oc-mr1-dev
am:
1e5152b539 -s ours
Change-Id: I2ada9a973b1728122a2beb5f47d105af4507c742
TreeHugger Robot [Fri, 13 Jul 2018 16:05:32 +0000 (16:05 +0000)]
Merge "vpn: allow IPSec traffic through Always-on VPN" into oc-dev
TreeHugger Robot [Fri, 13 Jul 2018 16:05:27 +0000 (16:05 +0000)]
Merge "vpn: allow IPSec traffic through Always-on VPN" into oc-mr1-dev
Bernie Innocenti [Fri, 13 Jul 2018 13:30:01 +0000 (06:30 -0700)]
[automerger skipped] Merge "vpn: allow IPSec traffic through Always-on VPN" into pi-dev
am:
903d59735e -s ours
Change-Id: I459cc0215436f5fb1266a9053404487ac1cbd1f4
Jorim Jaggi [Mon, 9 Jul 2018 15:57:10 +0000 (17:57 +0200)]
Pin compiled code of HOME app
Keeping the code in memory of the currently set home app is
important for latency as we don't have any kind of starting
window/splash screen when pressing the home app to hide any latency.
Memory impact:
Pinning dex/vdex:
In practical scenarios, this should be < 500kb.
The home app is usually profile-speed compiled, for which the
resulting dex/vdex files are about 2 mb. However, during regular
use, at least 1.5 MB of it is referenced in memory. This makes
sense: By definition profile-speed only compiles the things that
is usually frequently executed during regular execution.
Pinning apk:
With Launcher 3 in practical scenarios this should be about 3.7 MB,
as the APK is about 5.7 MB but 2 MB are usually referenced in any
case.
Bug:
111132016
Bug:
78585335
Test: Inspect "adb shell dumpsys pinner" after boot.
Test: Check for pinned files after updating camera/home.
Test: Check for pinned files after user switch with different
default apps.
Test: Check for pinned files after bg-dexopt.
Test: Check for pinned files after bg-dexopt + kill pid.
Change-Id: I6cdbc06d089efeb1c72a51216879ba0573502009
Merged-In: I6cdbc06d089efeb1c72a51216879ba0573502009
TreeHugger Robot [Fri, 13 Jul 2018 13:19:48 +0000 (13:19 +0000)]
Merge "vpn: allow IPSec traffic through Always-on VPN" into pi-dev
Yueming Wang [Fri, 13 Jul 2018 10:29:43 +0000 (10:29 +0000)]
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
Bill Yi [Fri, 13 Jul 2018 11:12:01 +0000 (04:12 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I123ada1f5523bb94ee1b7df86889f557566256cd
Jack Yu [Thu, 12 Jul 2018 22:10:34 +0000 (15:10 -0700)]
DO NOT MERGE - Revert "Hide IWLAN system API"
This reverts commit
ea440a765e2774320910073e5350bdccd39afb6c, reversing
changes made to
0b90c524cb8288f3b8d8111b5724c02630c5b4c6.
Test: Build
Bug:
73659459
Change-Id: Id5a5147c6478cf10661aebe52b445bd16195885e
Evan Laird [Fri, 13 Jul 2018 00:54:51 +0000 (17:54 -0700)]
Merge "DO NOT MERGE: Use minimumHeight in QS header" into pi-dev
am:
090e9d232c
Change-Id: Ifdd605c54262b533b405a6161b7b857609d576bc
TreeHugger Robot [Thu, 12 Jul 2018 23:34:50 +0000 (23:34 +0000)]
Merge "DO NOT MERGE: Use minimumHeight in QS header" into pi-dev
Hall Liu [Thu, 12 Jul 2018 23:07:43 +0000 (16:07 -0700)]
Merge "Update SubscriptionInfo o use strings for mccmnc" am:
0babf1815c
am:
08a4eb9445
Change-Id: I0462d1de1c2622499470b00195897ce370a13020
Jean-Michel Trivi [Thu, 12 Jul 2018 22:59:41 +0000 (15:59 -0700)]
Merge "Audio assets: add NFC sounds" am:
5cb7cd68a0
am:
8df8455384
Change-Id: I11d6eba4ca5e888e71e91fdef2d7dd8383391ec8
Jack Yu [Thu, 12 Jul 2018 22:52:35 +0000 (15:52 -0700)]
[automerger skipped] Merge "Revert "Added documentation for network registration state"" am:
1cbcc50d0a -s ours
am:
2016ffc9ec
Change-Id: I037d2b66b69b9a968a076888fcd74b178448809b
Hall Liu [Thu, 12 Jul 2018 22:22:52 +0000 (15:22 -0700)]
Merge "Update SubscriptionInfo o use strings for mccmnc"
am:
0babf1815c
Change-Id: I1833cb2d5437cccb61cc8f6dcd884a45a2b3250f
Jorim Jaggi [Thu, 12 Jul 2018 22:09:20 +0000 (15:09 -0700)]
Merge "DO NOT MERGE Remove WTF spam" into pi-dev
am:
650ead619e
Change-Id: I6d4300530516c25a5eb9af8ea8f924591eff3b95
Winson Chung [Thu, 12 Jul 2018 21:46:31 +0000 (14:46 -0700)]
Merge "Acquire service lock in AppTaskImpl.moveToFront()" into pi-dev
am:
7775af2778
Change-Id: I54d224436509531cfd0e33cce97d8471c0867447
Jean-Michel Trivi [Thu, 12 Jul 2018 21:36:35 +0000 (14:36 -0700)]
Merge "Audio assets: add NFC sounds"
am:
5cb7cd68a0
Change-Id: I84755ad470a4826879cd6c148c9a041bce6a7920
Jorim Jaggi [Thu, 12 Jul 2018 21:32:53 +0000 (21:32 +0000)]
Merge "DO NOT MERGE Remove WTF spam" into pi-dev
Bill Yi [Thu, 12 Jul 2018 21:31:15 +0000 (14:31 -0700)]
Merge changes from topic "am-
9f47cb6c-9cea-4b25-9f9b-
e0e460e471ac" into oc-dev am:
71bd839856 am:
262d6935a0 am:
d9bd9d1c04
am:
4ab42d5b8a
Change-Id: I5afb90731ccdc2afc1df7c9ac45f9efaa0820ac5
Bill Yi [Thu, 12 Jul 2018 21:16:01 +0000 (14:16 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
f4037fb69e skipped:
741c97faa9 am:
0c31d81cd1 -s ours am:
afb05522f1 -s ours am:
f85971f3a2 -s ours
am:
698e7ebb0b -s ours
Change-Id: I005a54804323515e99552fc4bde76bc079d78f35
Hall Liu [Thu, 12 Jul 2018 21:13:16 +0000 (21:13 +0000)]
Merge "Update SubscriptionInfo o use strings for mccmnc"
Bill Yi [Thu, 12 Jul 2018 20:57:24 +0000 (13:57 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
e059d5fb83 skipped:
e97378c657 am:
9935787f3b -s ours am:
bf789ba0d1 -s ours am:
847b7d112e -s ours
am:
5bf0d3e61c -s ours
Change-Id: I1ee3b8540dec46bdd7e9539b469567f498ddd68f
Jack Yu [Thu, 12 Jul 2018 20:52:49 +0000 (13:52 -0700)]
[automerger skipped] Merge "Revert "Added documentation for network registration state""
am:
1cbcc50d0a -s ours
Change-Id: I02d1877b0bd5d84895ea12590c8ea0668e0255db
Winson Chung [Thu, 12 Jul 2018 20:46:44 +0000 (20:46 +0000)]
Merge "Acquire service lock in AppTaskImpl.moveToFront()" into pi-dev
Nathan Harold [Thu, 12 Jul 2018 18:34:17 +0000 (11:34 -0700)]
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
Bill Yi [Thu, 12 Jul 2018 20:37:57 +0000 (13:37 -0700)]
Merge changes from topic "am-
9f47cb6c-9cea-4b25-9f9b-
e0e460e471ac" into oc-dev am:
71bd839856 am:
262d6935a0
am:
d9bd9d1c04
Change-Id: Id7b15870681b4971920a36db92198bb32d92ef51
Evan Laird [Mon, 2 Jul 2018 21:43:59 +0000 (17:43 -0400)]
DO NOT MERGE: Use minimumHeight in QS header
Allow QuickStatusBarHeader to use a minimum hieight so that it doesn't
draw underneath of a notch when display densities are low.
Bug:
78110564
Test: visual
Change-Id: I44df89c3b98dc0bdb8455b36e7ad023b92676c9d
Bill Yi [Thu, 12 Jul 2018 20:27:05 +0000 (13:27 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
f4037fb69e skipped:
741c97faa9 am:
0c31d81cd1 -s ours am:
afb05522f1 -s ours
am:
f85971f3a2 -s ours
Change-Id: I0891178936b34370816eb9c15fd4103ecee586cc
Nathan Harold [Thu, 12 Jul 2018 20:26:41 +0000 (13:26 -0700)]
Merge "Remove Duplicate Override for Operator Alphas" am:
24eaa6ab3d
am:
f5f908c525
Change-Id: I9fe744ec118df8e68616d72f2c26db612b2b49a0
Bill Yi [Thu, 12 Jul 2018 20:24:55 +0000 (13:24 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
e059d5fb83 skipped:
e97378c657 am:
9935787f3b -s ours am:
bf789ba0d1 -s ours
am:
847b7d112e -s ours
Change-Id: I236fce4894fa4dda79e34ed191560598dcd2a4c4
Bill Yi [Thu, 12 Jul 2018 20:17:45 +0000 (13:17 -0700)]
Merge changes from topic "am-
9f47cb6c-9cea-4b25-9f9b-
e0e460e471ac" into oc-dev am:
71bd839856
am:
262d6935a0
Change-Id: Ic9027e92228853ab6dffacf72c0afc3920946d19
Bill Yi [Thu, 12 Jul 2018 20:10:22 +0000 (13:10 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
f4037fb69e skipped:
741c97faa9 am:
0c31d81cd1 -s ours
am:
afb05522f1 -s ours
Change-Id: I92e39d42756e8d5d7f517802ddbdc8e539024d88
Bill Yi [Thu, 12 Jul 2018 20:08:42 +0000 (13:08 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
e059d5fb83 skipped:
e97378c657 am:
9935787f3b -s ours
am:
bf789ba0d1 -s ours
Change-Id: I157f816f170fc9af6263e552a46612fab2760f63
Bill Yi [Thu, 12 Jul 2018 19:47:58 +0000 (12:47 -0700)]
Merge changes from topic "am-
9f47cb6c-9cea-4b25-9f9b-
e0e460e471ac" into oc-dev
am:
71bd839856
Change-Id: Ic7c05906f4d2f9fecc9ab93ab90b9869d8b176be
Bill Yi [Thu, 12 Jul 2018 19:45:19 +0000 (12:45 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
f4037fb69e skipped:
741c97faa9
am:
0c31d81cd1 -s ours
Change-Id: I404ba441a96f77be638d89c0c43f950200a94376
Jean-Michel Trivi [Thu, 12 Jul 2018 19:41:51 +0000 (19:41 +0000)]
Merge "Audio assets: add NFC sounds"
Bill Yi [Thu, 12 Jul 2018 19:41:11 +0000 (12:41 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
e059d5fb83 skipped:
e97378c657
am:
9935787f3b -s ours
Change-Id: I1ef782ee8a7ed8da6baed44c052f1fa3a08c1af4
Nathan Harold [Thu, 12 Jul 2018 19:35:18 +0000 (12:35 -0700)]
Merge "Remove Duplicate Override for Operator Alphas"
am:
24eaa6ab3d
Change-Id: I15004a7df3d922ba50d187769299723e888febae
TreeHugger Robot [Thu, 12 Jul 2018 19:26:31 +0000 (19:26 +0000)]
Merge changes from topic "am-
9f47cb6c-9cea-4b25-9f9b-
e0e460e471ac" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
f4037fb69e skipped:
741c97faa9
[automerger skipped] Import translations. DO NOT MERGE skipped:
f4037fb69e
Import translations. DO NOT MERGE
Jordan Liu [Thu, 12 Jul 2018 18:56:50 +0000 (11:56 -0700)]
Merge "WRITE_APN_SETTINGS is also required to read" am:
0beefc0af5
am:
e5c77fc978
Change-Id: I42a6e604ff65bbb77d0f23c584722c1ea44038e6
Jordan Liu [Thu, 12 Jul 2018 18:46:32 +0000 (11:46 -0700)]
Merge "WRITE_APN_SETTINGS is also required to read"
am:
0beefc0af5
Change-Id: I1ac69c71c7bdb39a9631da00a8bda89f7c1f0edd
Neil Fuller [Thu, 12 Jul 2018 18:42:14 +0000 (11:42 -0700)]
Merge "Move XML object factory logic to libcore" am:
8176fb99e1
am:
7add22db60
Change-Id: If395891203fae0a8b55f8f58430adc979b758db2
Jack Yu [Thu, 12 Jul 2018 18:35:03 +0000 (11:35 -0700)]
[automerger skipped] Merge "Added documentation for network registration state" am:
c51397b161 -s ours
am:
6af5ddcc4a
Change-Id: I7ea119e9f8d580e18efa56f1cfa3be4c86c18bea
Neil Fuller [Thu, 12 Jul 2018 18:26:03 +0000 (11:26 -0700)]
Merge "Move XML object factory logic to libcore"
am:
8176fb99e1
Change-Id: Ib0940ecb89eaf11841bbd66cdaf1c5379466496c
Jack Yu [Thu, 12 Jul 2018 18:21:11 +0000 (11:21 -0700)]
[automerger skipped] Merge "Added documentation for network registration state"
am:
c51397b161 -s ours
Change-Id: I33f775c099c949f117badea85fadaa3e5a2eec7a
Jack Yu [Thu, 12 Jul 2018 18:16:26 +0000 (18:16 +0000)]
Merge "Revert "Added documentation for network registration state""
Bill Yi [Thu, 12 Jul 2018 18:15:44 +0000 (11:15 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Id078d2f27ad8fb15561b5c0175ecef5c7e84b5e3
Nathan Harold [Thu, 12 Jul 2018 18:08:05 +0000 (18:08 +0000)]
Merge "Remove Duplicate Override for Operator Alphas"
Wale Ogunwale [Wed, 11 Jul 2018 22:22:01 +0000 (15:22 -0700)]
Acquire service lock in AppTaskImpl.moveToFront()
Oversight from previous refactor in O release done in ag/
2987716
Change-Id: I2e2d6e55251eb319ddee0db97eedc1c574736ead
Merged-In: I2e2d6e55251eb319ddee0db97eedc1c574736ead
Fixes:
111336376
Test: builds
chened [Thu, 12 Jul 2018 17:53:26 +0000 (10:53 -0700)]
Merge "Camera: Use session configuraion when recording tests" into pi-dev
am:
26da9f18ed
Change-Id: I68975212f84e6e31c2dffb002749d2ec735689b5