OSDN Git Service
Erik Kline [Thu, 5 Jul 2018 12:32:16 +0000 (05:32 -0700)]
Merge "Always close file descriptors" am:
26025a06ec
am:
de8eac9ae1
Change-Id: Id25f948b6b4d25ac033d9b608ab4a6b474f2c606
Neil Fuller [Thu, 5 Jul 2018 12:25:35 +0000 (05:25 -0700)]
Merge "Track constructor changes in libcore/" am:
f94eb29500
am:
67dcf6da3c
Change-Id: I1205219e1fead95ecdb8f9ce5d503ec416baf4c2
Erik Kline [Thu, 5 Jul 2018 12:20:25 +0000 (05:20 -0700)]
Merge "Always close file descriptors"
am:
26025a06ec
Change-Id: Ib1d8f74832b8b649dc83de39f8f16651a9924e69
Neil Fuller [Thu, 5 Jul 2018 12:14:26 +0000 (05:14 -0700)]
Merge "Track constructor changes in libcore/"
am:
f94eb29500
Change-Id: I344d9210bd173f78651318366c852f65afe969d6
Treehugger Robot [Thu, 5 Jul 2018 09:07:21 +0000 (09:07 +0000)]
Merge "Always close file descriptors"
Neil Fuller [Thu, 5 Jul 2018 08:57:13 +0000 (08:57 +0000)]
Merge "Track constructor changes in libcore/"
Erik Kline [Wed, 4 Jul 2018 08:57:51 +0000 (17:57 +0900)]
Always close file descriptors
Every error thrown leaked a netlink NETFILTER socket.
Test: as follows
- built, flashed, booted
- runtest frameworks-net passes
- enabled tethering and tried to cause conntrack updates to sessions
that had expired (which causes ErrnoExceptions to be thrown)
while monitoring lsof for system_server's NETFILTER sockets
Bug:
32163131
Bug:
64976634
Bug:
110122306
Change-Id: Ib52b812e8434c27ad9f2596666400c13e03c2216
Bill Yi [Thu, 5 Jul 2018 04:25:49 +0000 (21:25 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
3f4b3c946d -s ours
Change-Id: Ifa2e1f1e6a4ad161737403167925f8f7721a6542
Shuichi.Noguchi [Thu, 5 Jul 2018 00:17:04 +0000 (17:17 -0700)]
Merge "Fix the logic to get tv_pip_settings_class_name" am:
d004710e0e
am:
08923b73f4
Change-Id: I5b4b6a208cb6fde4ba806f5aec3782244b772b94
Shuichi.Noguchi [Thu, 5 Jul 2018 00:07:32 +0000 (17:07 -0700)]
Merge "Fix the logic to get tv_pip_settings_class_name"
am:
d004710e0e
Change-Id: Ieecde6f75fd7788835fa34300f1fbec5eb963862
Bill Yi [Wed, 4 Jul 2018 23:58:23 +0000 (16:58 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I28cf7af28a854687af1b92930a9e79e02d685c35
Treehugger Robot [Wed, 4 Jul 2018 22:45:16 +0000 (22:45 +0000)]
Merge "Fix the logic to get tv_pip_settings_class_name"
Lucas Dupin [Wed, 4 Jul 2018 02:45:44 +0000 (19:45 -0700)]
Merge "DO NOT MERGE: Delay brightness change" into pi-dev
am:
0937d1807b
Change-Id: Ib280983ca722add1f89f7a640a4f19c761239de9
TreeHugger Robot [Wed, 4 Jul 2018 02:34:42 +0000 (02:34 +0000)]
Merge "DO NOT MERGE: Delay brightness change" into pi-dev
Lucas Dupin [Mon, 2 Jul 2018 18:17:14 +0000 (11:17 -0700)]
DO NOT MERGE: Delay brightness change
During a fingerprint wake-up, the display state changes bumping up
the display brightness. This means that the screen will flash
bright if the scrims couldn't draw and blank the screen yet.
The fix updates the state of the keyguard, waits for the frame to be
pushed to the display (can take up to 2 frames since we're using
triple buffers), when then asks PowerManager to wake-up the device.
Fixes:
80415238
Test: fp unlock with AOD on and off on devices with displays from
multiple vendors
Change-Id: I60f0e265c4af87cc1cb4fcf31e89558a330a4b71
Merged-In: I752f9bd5ffd754166ffee7dc15960909dd3f1a81
Tyler Gunn [Tue, 3 Jul 2018 23:36:52 +0000 (16:36 -0700)]
Merge "ImsMultiEndPoint - Sip Notify Change" am:
bc103bdf18
am:
4a319c85bd
Change-Id: I6516ead9bfb3aa6b7c2d460fdab8de076cd07876
Tyler Gunn [Tue, 3 Jul 2018 23:27:56 +0000 (16:27 -0700)]
Merge "ImsMultiEndPoint - Sip Notify Change"
am:
bc103bdf18
Change-Id: I2dbc17af8694cdb92e189202e0786fc39573b0d1
Tor Norbye [Tue, 3 Jul 2018 23:25:22 +0000 (16:25 -0700)]
[automerger skipped] Merge "Include annotations in metalava stubs" into pi-dev
am:
9654ecebd7 -s ours
Change-Id: I7513067846f13da2189a46f270a3a4ca0dbe0504
Tor Norbye [Tue, 3 Jul 2018 23:11:25 +0000 (23:11 +0000)]
Merge "Include annotations in metalava stubs" into pi-dev
Tyler Gunn [Tue, 3 Jul 2018 22:15:21 +0000 (22:15 +0000)]
Merge "ImsMultiEndPoint - Sip Notify Change"
Sumit Das [Sat, 30 Jun 2018 00:12:01 +0000 (17:12 -0700)]
ImsMultiEndPoint - Sip Notify Change
-Added log message, getter method and set/read from parcel
Change-Id: I832bd2cf51382bb0919ab0ea1b5c7fcba8b2b136
Lei Yu [Tue, 3 Jul 2018 20:41:34 +0000 (13:41 -0700)]
Merge "Add active admin app to power white list." into pi-dev
am:
a14e1b3950
Change-Id: I06229f8ee9fb72d579773c566f93ba447d18f4e5
TreeHugger Robot [Tue, 3 Jul 2018 20:24:58 +0000 (20:24 +0000)]
Merge "Add active admin app to power white list." into pi-dev
Neil Fuller [Tue, 3 Jul 2018 20:17:31 +0000 (13:17 -0700)]
Merge "Make Half class use public APIs" am:
7e957e57b7
am:
04c66489bc
Change-Id: I35fa0a22465885a47612601d541afb366b5953ec
Neil Fuller [Tue, 3 Jul 2018 20:08:26 +0000 (13:08 -0700)]
Merge "Make Half class use public APIs"
am:
7e957e57b7
Change-Id: I7f41f07ed5d35a0c538c90b49b4500ba9952f74d
Lucas Dupin [Tue, 3 Jul 2018 19:20:31 +0000 (12:20 -0700)]
Merge "Cross fade wake-up from pulsing" into pi-dev
am:
42e713d7a3
Change-Id: Ieb0607ff1abf36ca56565b49aeb2f565a115bc55
Jean-Michel Trivi [Tue, 3 Jul 2018 19:11:10 +0000 (12:11 -0700)]
Merge "AudioService: history of A2DP commands" into pi-dev
am:
cd64600ba8
Change-Id: Ibc294825a942fd0f4b5fbe6c09eafac43ed2cccc
Minchan Kim [Tue, 3 Jul 2018 19:05:38 +0000 (12:05 -0700)]
Merge "Add system_server to system group only if per_app_memcg is true" into pi-dev
am:
fb11e4c9b1
Change-Id: Icc9d0bb40515a87ddb0c8c0b28d0715a3f6bb0fe
Eran Messeri [Tue, 3 Jul 2018 18:59:13 +0000 (11:59 -0700)]
Merge "Correctly preserve key generation parameters" into pi-dev
am:
6f7cfb0627
Change-Id: Id7fb68a441e873f7ae844bfc87f7f60798ecd57c
Lucas Dupin [Tue, 3 Jul 2018 18:52:23 +0000 (18:52 +0000)]
Merge "Cross fade wake-up from pulsing" into pi-dev
Jean-Michel Trivi [Tue, 3 Jul 2018 18:49:33 +0000 (18:49 +0000)]
Merge "AudioService: history of A2DP commands" into pi-dev
TreeHugger Robot [Tue, 3 Jul 2018 18:39:18 +0000 (18:39 +0000)]
Merge "Add system_server to system group only if per_app_memcg is true" into pi-dev
Neil Fuller [Tue, 3 Jul 2018 18:32:27 +0000 (18:32 +0000)]
Merge "Make Half class use public APIs"
TreeHugger Robot [Tue, 3 Jul 2018 18:31:06 +0000 (18:31 +0000)]
Merge "Correctly preserve key generation parameters" into pi-dev
Neil Fuller [Tue, 3 Jul 2018 18:22:45 +0000 (19:22 +0100)]
Track constructor changes in libcore/
The 2-arg constructor is being removed.
Test: build / boot
Bug:
111055375
Change-Id: I72413a8c7885f9514a88f59deb649fa755deff92
Erik Kline [Tue, 3 Jul 2018 10:19:32 +0000 (03:19 -0700)]
Merge "Push DNS configuration on network validation" am:
ef941e192a
am:
e3f76635f7
Change-Id: Ic2046e053faf58e2edf2824e01145c61a9f2991f
Erik Kline [Tue, 3 Jul 2018 10:09:16 +0000 (03:09 -0700)]
Merge "Push DNS configuration on network validation"
am:
ef941e192a
Change-Id: I5907831e5f5f1f3659580cc56e2e081cbe88b1cc
Treehugger Robot [Tue, 3 Jul 2018 09:03:35 +0000 (09:03 +0000)]
Merge "Push DNS configuration on network validation"
Jack Yu [Tue, 3 Jul 2018 08:21:06 +0000 (01:21 -0700)]
[automerger skipped] Merge "Reordered the params for network registration" am:
38f7576297 -s ours
am:
d111501e8c
Change-Id: I86db28ba40fbb73fe0b50f8e751740767d22300f
Jack Yu [Tue, 3 Jul 2018 08:12:03 +0000 (01:12 -0700)]
[automerger skipped] Merge "Reordered the params for network registration"
am:
38f7576297 -s ours
Change-Id: Ibbe9027176ff14eae912c794fb0724cdc32f4926
Erik Kline [Tue, 26 Jun 2018 09:53:43 +0000 (18:53 +0900)]
Push DNS configuration on network validation
Test: as follows
- built, flashed, booted
- runtest frameworks-net passes
- connected to captive portal network,
saw failed validation attempt (opportunistic),
passed portal, saw successful revalidation attempt
Bug:
64133961
Bug:
72344805
Bug:
109928338
Change-Id: I0471685c2234af8a8c7f5b2ad3205eb6e36333c5
Carmen Jackson [Tue, 3 Jul 2018 01:52:46 +0000 (18:52 -0700)]
Merge "Add in-app tracepoints to TouchLatency app." am:
674fd12278
am:
b6d12b8bb1
Change-Id: I719439a6323ef38f2f39cd578cc4700b9e70850c
Jean-Michel Trivi [Mon, 2 Jul 2018 17:48:04 +0000 (10:48 -0700)]
AudioService: history of A2DP commands
Keep history of command coming from A2dpService in AudioService
logger.
Bug:
110186160
Test: connect/disconnect A2DP device and take bugreport,
or run $ adb shell dumpsys audio
Change-Id: Ice65c20e91aa2675fbacb1c326a53d5b02bba3e5
Lei Yu [Thu, 28 Jun 2018 21:06:29 +0000 (14:06 -0700)]
Add active admin app to power white list.
So user can't restrict it in settings app.
Bug:
110337989
Test: RunSettingsLibTests
Change-Id: Ie32dc8b2204369c9ca8f704436d5c988f76481ae
Merged-In: Ie32dc8b2204369c9ca8f704436d5c988f76481ae
Carmen Jackson [Tue, 3 Jul 2018 00:57:29 +0000 (17:57 -0700)]
Merge "Add in-app tracepoints to TouchLatency app."
am:
674fd12278
Change-Id: I69a89ba6fac90a454a1d8befe9317af25979ccbf
SongFerngWang [Tue, 3 Jul 2018 00:12:49 +0000 (17:12 -0700)]
Merge "add three new carrier configs for call forwarding, Caller ID and Call Waiting." into pi-dev
am:
9ccabdbc45
Change-Id: I7517b64e87b43acff501afc858c8fad433d0ecfc
TreeHugger Robot [Tue, 3 Jul 2018 00:01:52 +0000 (00:01 +0000)]
Merge "add three new carrier configs for call forwarding, Caller ID and Call Waiting." into pi-dev
Treehugger Robot [Mon, 2 Jul 2018 23:56:11 +0000 (23:56 +0000)]
Merge "Reordered the params for network registration"
Treehugger Robot [Mon, 2 Jul 2018 23:39:21 +0000 (23:39 +0000)]
Merge "Add in-app tracepoints to TouchLatency app."
Nathan Harold [Mon, 2 Jul 2018 23:17:52 +0000 (16:17 -0700)]
Merge "Update Docstrings for CellSignalStrengthLte" am:
5e8a5d4b79
am:
0571b04c3a
Change-Id: I52a3de4f89b3a59cb4f33263cb5838d37fb0a7fb
Nathan Harold [Mon, 2 Jul 2018 23:07:37 +0000 (16:07 -0700)]
Merge "Update Docstrings for CellSignalStrengthLte"
am:
5e8a5d4b79
Change-Id: Id41fb2ccdeaf43fcc62193c78c93f4ca765d2fa2
Jorim Jaggi [Mon, 2 Jul 2018 21:47:09 +0000 (14:47 -0700)]
Merge "Only use simple rects for cutout region" into pi-dev
am:
4764921dcc
Change-Id: Icfb41008189d5c01f90afd4992428433043b4c4e
Carmen Jackson [Thu, 28 Jun 2018 22:15:44 +0000 (15:15 -0700)]
Add in-app tracepoints to TouchLatency app.
Test: Traced the TouchLatency app and saw the added tracepoints.
Change-Id: I72ab8f88731e635f98831f045dddd086a05acc3b
Jorim Jaggi [Mon, 2 Jul 2018 21:35:50 +0000 (21:35 +0000)]
Merge "Only use simple rects for cutout region" into pi-dev
Colin Cross [Mon, 2 Jul 2018 21:04:10 +0000 (14:04 -0700)]
Include annotations in metalava stubs
Pass --include-annotation-classes tools/metalava/stub-annotations
to metalava so that the stubs end up in the final jar. They will be
post-processed with metalava --rewrite-annotations to avoid affecting
the public SDK.
Bug:
110532131
Test: m out/target/common/obj/JAVA_LIBRARIES/metalava_android_stubs_current_intermediates/classes.jar
Change-Id: Icb9268a72aa7de82ed6ad88aef9ac813796f9bf9
Merged-In: I116643925a3a9594e8590c3714e93d0fb0ac372f
Nathan Harold [Mon, 2 Jul 2018 20:40:55 +0000 (20:40 +0000)]
Merge "Update Docstrings for CellSignalStrengthLte"
Lucas Dupin [Mon, 2 Jul 2018 18:50:37 +0000 (11:50 -0700)]
Merge "Move charging indication vertically on time tick" into pi-dev
am:
5baaf461a6
Change-Id: I455c53bf85fd7fcfe87daef6d76888a37fecb015
TreeHugger Robot [Mon, 2 Jul 2018 18:39:55 +0000 (18:39 +0000)]
Merge "Move charging indication vertically on time tick" into pi-dev
Lucas Dupin [Wed, 27 Jun 2018 18:44:57 +0000 (11:44 -0700)]
Move charging indication vertically on time tick
Before, a new translation was only calculated when the device enters
AOD, and then, during time tick, we would only move it 5px wich isn't
enough.
Now, the translation varies 5dps vertically on every time tick.
Fixes:
110888643
Test: take screenshots for N minutes and compare them
Change-Id: Ia3f239d669b83aad0d97d8d7a7f7374f4890777d
Merged-In: Ia3f239d669b83aad0d97d8d7a7f7374f4890777d
Lucas Dupin [Wed, 27 Jun 2018 20:35:52 +0000 (13:35 -0700)]
Cross fade wake-up from pulsing
Activate WM animation and remove scrims when
fading keyguard from the pulsing state to prettify
animation on new devices.
Test: wake up with fp from pulsing to launcher
Test: wake up with fp from pulsing to app
Fixes:
110824274
Change-Id: I0446f26939a2e25cd50d0d39f3fc703019196f7a
Jorim Jaggi [Thu, 28 Jun 2018 23:14:31 +0000 (01:14 +0200)]
Only use simple rects for cutout region
Otherwise there is a big performance hit in all kinds of
situations where we do operations with the region, specifically
when:
- updating input windows
- insetting the cutout during layout
- touch dispatch
Test: DisplayCutoutTest, WmDisplayCutoutTest
Bug:
110464019
Bug:
110452325
Change-Id: I94a25c3794ecd33b8b7204ca308ac91623498f13
Sehee Park [Mon, 2 Jul 2018 13:46:09 +0000 (06:46 -0700)]
Merge "Modify catch when addInterfaceToLocalNetwork() is called." am:
ccd6a0f6c2
am:
c7b925063f
Change-Id: Ia160a4cf42e427575a70810d7157e092e47b5992
Sehee Park [Mon, 2 Jul 2018 13:23:35 +0000 (06:23 -0700)]
Merge "Modify catch when addInterfaceToLocalNetwork() is called."
am:
ccd6a0f6c2
Change-Id: I9842ae51d3bb4665f5cb24b7685a05de2df05097
Treehugger Robot [Mon, 2 Jul 2018 11:22:28 +0000 (11:22 +0000)]
Merge "Modify catch when addInterfaceToLocalNetwork() is called."
Neil Fuller [Mon, 2 Jul 2018 11:04:39 +0000 (12:04 +0100)]
Make Half class use public APIs
Half has a dependency on an internal sun.misc.FloatingDecimal
that can be replaced by an equivalent call on java.lang.Float
(which calls through to FloatingDecimal).
Any performance hit is worth it for a smaller API surface.
Bug:
111055375
Test: Build
Change-Id: Iecdf3aa9414922a77edbdc439b0c2b88033b3af8
Sehee Park [Tue, 19 Jun 2018 11:07:37 +0000 (20:07 +0900)]
Modify catch when addInterfaceToLocalNetwork() is called.
Fatal Exception is occured in system process. Becuase addInterfaceToLocalNetwork()
throw IllegalStateException but it can not be handled in TetherInterfaceStateMachine.
Modify catch from "RemoteException" to "Exception" when addInterfaceToLocalNetwork() is called.
Test: Repeat on/off tethering
Test: "runtest --no-hidden-api-checks frameworks-net" passes
Bug:
110396460
Change-Id: I2f2f1325cfcce40c3113ccccf69b2bbd5df4ae5b
Signed-off-by: Sehee Park <sehee32.park@samsung.com>
SongFerng Wang [Sat, 30 Jun 2018 06:34:15 +0000 (23:34 -0700)]
Merge "add three new carrier configs for call forwarding, Caller ID and Call Waiting." into pi-dev
am:
d7b5946628
Change-Id: I7f11346be248bd325f14d7039f5a5d5b2f45617a
SongFerng Wang [Sat, 30 Jun 2018 06:22:12 +0000 (06:22 +0000)]
Merge "add three new carrier configs for call forwarding, Caller ID and Call Waiting." into pi-dev
Jack Yu [Sat, 30 Jun 2018 01:40:06 +0000 (18:40 -0700)]
Merge "Used APN type instead of APN id" am:
2e371c1b5a
am:
a916542011
Change-Id: I58bb518a7720e65edd73d93b5775fa4cc40b41db
SongFerngWang [Thu, 28 Jun 2018 09:28:22 +0000 (17:28 +0800)]
add three new carrier configs for call forwarding, Caller ID and Call Waiting.
The carrier configs control the call forwarding and additional
settings button in the Call Settings menu and caller ID and
call waiting in additional settings menu.
Bug:
110121209
Test: manual - test case as below :
1.flag clir on and flag cw on ,do CLIR show/hide,
and make call to other device.(PASS)
2.flag clir on and flag cw on ,do CW on/off,and CW function work.(PASS)
3.flag clir off and flag cw on ,no CLIR in additional settings page(PASS)
4.flag clir off and flag cw on ,do CW on/off,and CW function work.(PASS)
5.flag clir on and flag cw off ,do CLIR show/hide ,
and make call to other device.(PASS)
6.flag clir on and flag cw off ,no CW in additional settings page(PASS)
7.flag clir off and flag cw off,
no Additional Settings in call feature settings(PASS)
8.flag cf off,no cf in call settings page (PASS)
Change-Id: I29d7a71ad57b3b05ccc6025154f63119b35dab71
Jack Yu [Sat, 30 Jun 2018 01:06:39 +0000 (18:06 -0700)]
Merge "Used APN type instead of APN id"
am:
2e371c1b5a
Change-Id: Ib920746cb39937165aa97f79a9ac4e2fed850572
Jack Yu [Fri, 29 Jun 2018 23:54:32 +0000 (23:54 +0000)]
Merge "Used APN type instead of APN id"
Minchan Kim [Wed, 27 Jun 2018 02:32:40 +0000 (11:32 +0900)]
Add system_server to system group only if per_app_memcg is true
P18 or other high-performance devices shouldn't use per-memcg so
it was disabled on those devices[1]. However, we didn't turn off
for system_server memcg so those devices still have two seperate
LRU groups which would have less efficient memory reclaim.
Therefore, this patch makes memcg use for system_server only if
per_app_memcg is enabled.
[1] https://googleplex-android-review.git.corp.google.com/c/platform/system/core/+/
4178592
Bug:
110858093
Test: confirm via cat /dev/memcg/system/tasks is none
Change-Id: Ic0e3157bf8ff5de69767797b5508946ca3efeb68
Signed-off-by: Minchan Kim <minchan@google.com>
Nathan Harold [Fri, 29 Jun 2018 22:46:45 +0000 (15:46 -0700)]
Merge changes I0d635067,I1424973b am:
4d7a010983
am:
3b08d8ff77
Change-Id: I323c57f0ad262a5875fcac7370dfb75d116f4bca
Nathan Harold [Fri, 29 Jun 2018 22:39:19 +0000 (15:39 -0700)]
Merge changes I0d635067,I1424973b
am:
4d7a010983
Change-Id: I4372305da9b4b6b488bdeda0ec97b412e92bce58
Jack Yu [Tue, 26 Jun 2018 00:40:02 +0000 (17:40 -0700)]
Used APN type instead of APN id
APN id is similar to ApnSetting.ApnType. We can just use the apn
type. No need to use APN id anymore.
Test: Telephony sanity tests + unit tests
Bug:
77511388
Merged-In: If41845604ea14f36272262da110d682eea0d5451
Change-Id: If41845604ea14f36272262da110d682eea0d5451
(cherry picked from commit
f42d06010a522b0d519df1a2ce9fa5ba3aefb51f)
Amit Mahajan [Fri, 29 Jun 2018 21:43:38 +0000 (14:43 -0700)]
[automerger skipped] Merge "Add new carrier config for CDMA registered PLMN when not roaming." am:
c8eb9ef591
am:
d7a5190868 -s ours
Change-Id: Id98081b344dd9bd9376adcbcff23f7d1506c35af
SongFerngWang [Fri, 29 Jun 2018 07:40:20 +0000 (15:40 +0800)]
add three new carrier configs for call forwarding, Caller ID and Call Waiting.
The carrier configs control the call forwarding and additional
settings button in the Call Settings menu and caller ID and
call waiting in additional settings menu.
Bug:
110121209
Test: manual - test case as below :
1.flag clir on and flag cw on ,do CLIR show/hide,
and make call to other device.(PASS)
2.flag clir on and flag cw on ,do CW on/off,and CW function work.(PASS)
3.flag clir off and flag cw on ,no CLIR in additional settings page(PASS)
4.flag clir off and flag cw on ,do CW on/off,and CW function work.(PASS)
5.flag clir on and flag cw off ,do CLIR show/hide ,
and make call to other device.(PASS)
6.flag clir on and flag cw off ,no CW in additional settings page(PASS)
7.flag clir off and flag cw off,
no Additional Settings in call feature settings(PASS)
8.flag cf off,no cf in call settings page (PASS)
Change-Id: I91a64d43e61c38ac1d744b99a2f8f03bbcf49deb
Nathan Harold [Fri, 29 Jun 2018 21:23:26 +0000 (21:23 +0000)]
Merge changes I0d635067,I1424973b
* changes:
Simplify equals() method of ServiceState
Update ServiceState.hashCode()
Amit Mahajan [Fri, 29 Jun 2018 21:05:51 +0000 (14:05 -0700)]
Merge "Add new carrier config for CDMA registered PLMN when not roaming."
am:
c8eb9ef591
Change-Id: I1cc5af7ab6cbb722c14b549047cccd73a5ad9720
Treehugger Robot [Fri, 29 Jun 2018 19:55:16 +0000 (19:55 +0000)]
Merge "Add new carrier config for CDMA registered PLMN when not roaming."
Lucas Dupin [Fri, 29 Jun 2018 18:40:43 +0000 (11:40 -0700)]
Merge "AOD animation polish" into pi-dev
am:
704a0d6174
Change-Id: Ia5662e819573ba45707f4f2dd4f166c64d87154e
Lucas Dupin [Fri, 29 Jun 2018 18:27:46 +0000 (18:27 +0000)]
Merge "AOD animation polish" into pi-dev
Amit Mahajan [Tue, 5 Jun 2018 23:27:32 +0000 (16:27 -0700)]
Add new carrier config for CDMA registered PLMN when not roaming.
Test: manual
Bug:
80145031
Merged-in: I6533b4097f729df88f287348924563c6f459401c
Change-Id: I6533b4097f729df88f287348924563c6f459401c
(cherry picked from commit
22e89f4773d9cbc8f5911b65b2dae3e3add7bdb6)
Amit Mahajan [Fri, 29 Jun 2018 17:34:33 +0000 (10:34 -0700)]
Merge "Add new carrier config for CDMA registered PLMN when not roaming." into pi-dev
am:
fffc308084
Change-Id: I813c193b1c9d68f524ad74d21f0616516edc18d6
TreeHugger Robot [Fri, 29 Jun 2018 17:23:13 +0000 (17:23 +0000)]
Merge "Add new carrier config for CDMA registered PLMN when not roaming." into pi-dev
Sundong Ahn [Fri, 29 Jun 2018 03:53:52 +0000 (20:53 -0700)]
Merge "Build com.android.future.usb.accessory with java_sdk_library" am:
10cfc61774
am:
35d6bafc57
Change-Id: I205f0f1811b68aa41d105fbd8db24db52ae2d35e
Remi NGUYEN VAN [Fri, 29 Jun 2018 03:44:05 +0000 (20:44 -0700)]
[automerger skipped] Merge "Disable hidden API checks on unit tests" am:
855f0f03e1 -s ours
am:
44b1914000 -s ours
Change-Id: Id6a4bb03399d46a9e709cc13e6e338d884c3b87b
Sundong Ahn [Fri, 29 Jun 2018 03:38:09 +0000 (20:38 -0700)]
Merge "Build com.android.future.usb.accessory with java_sdk_library"
am:
10cfc61774
Change-Id: Ie6abdaa1c9f58ada60da5514bbd1ed261d09fd0b
Remi NGUYEN VAN [Fri, 29 Jun 2018 03:34:19 +0000 (20:34 -0700)]
[automerger skipped] Merge "Disable hidden API checks on unit tests"
am:
855f0f03e1 -s ours
Change-Id: I9ad7743e43efd5aaa722e73ea0b2543537d23c50
Treehugger Robot [Fri, 29 Jun 2018 02:51:43 +0000 (02:51 +0000)]
Merge "Build com.android.future.usb.accessory with java_sdk_library"
Remi NGUYEN VAN [Fri, 29 Jun 2018 02:15:47 +0000 (02:15 +0000)]
Merge "Disable hidden API checks on unit tests"
Brad Ebinger [Fri, 29 Jun 2018 00:34:48 +0000 (17:34 -0700)]
Merge "Emergency SMS carrier config flag" am:
36a9fa62be
am:
86ec65e59c
Change-Id: I63df676bf2270532c84cb950e4cac13858fbd4fb
Brad Ebinger [Fri, 29 Jun 2018 00:26:39 +0000 (17:26 -0700)]
Merge "Emergency SMS carrier config flag"
am:
36a9fa62be
Change-Id: If6a2b0316ee0fdac29eedcf77686694f538d5017
Nathan Harold [Thu, 28 Jun 2018 23:36:02 +0000 (16:36 -0700)]
[automerger skipped] Merge "Allow Cell Location for SYSTEM_UID and ROOT_UID" am:
9ca4d43922 -s ours
am:
f0893a15ab -s ours
Change-Id: I039631fce137f11a1eb6d65d57f5150b50b73303
Nathan Harold [Thu, 28 Jun 2018 23:26:56 +0000 (16:26 -0700)]
[automerger skipped] Merge "Allow Cell Location for SYSTEM_UID and ROOT_UID"
am:
9ca4d43922 -s ours
Change-Id: I2e148a4e55510acf0c0425b7e1ed6cdc1fb9eb34
Jack Yu [Sat, 9 Jun 2018 00:27:05 +0000 (17:27 -0700)]
Reordered the params for network registration
Test: Build
Bug:
73659459
Change-Id: I1af2c49a937177173b760d30b030da20f03c01d7
Brad Ebinger [Thu, 28 Jun 2018 22:16:10 +0000 (22:16 +0000)]
Merge "Emergency SMS carrier config flag"
Nathan Harold [Thu, 28 Jun 2018 22:05:56 +0000 (22:05 +0000)]
Merge "Allow Cell Location for SYSTEM_UID and ROOT_UID"
Siddharth Ray [Thu, 28 Jun 2018 21:46:17 +0000 (14:46 -0700)]
Merge "Fix in Wifi activity updates" into pi-dev
am:
f83e814b18
Change-Id: I7e42a65ef660029ecfc8a3bf17dac7b5beede755