OSDN Git Service
sqian [Sat, 16 Mar 2019 02:56:23 +0000 (19:56 -0700)]
Merge "CallRedirectionService API review"
am:
1276a178fd
Change-Id: I4509bfabae430b97ee82c2939b9099dc5767f44a
Josh Gao [Sat, 16 Mar 2019 02:52:34 +0000 (19:52 -0700)]
Merge "ParcelFileDescriptor: improve javadoc."
am:
c4e2b24d87
Change-Id: Ic01db5d3f9c7527f2458aa4cf10bd2c43d685bed
Treehugger Robot [Sat, 16 Mar 2019 02:42:29 +0000 (02:42 +0000)]
Merge "CallRedirectionService API review"
Treehugger Robot [Sat, 16 Mar 2019 02:36:30 +0000 (02:36 +0000)]
Merge "ParcelFileDescriptor: improve javadoc."
Tyler Gunn [Fri, 15 Mar 2019 23:51:04 +0000 (16:51 -0700)]
Merge "Cleanup unsupported appusage in Telecom apis."
am:
90723afa47
Change-Id: If983c7a0351138fcfb35d9060b0c17c7b9e2c69f
Tyler Gunn [Fri, 15 Mar 2019 23:36:21 +0000 (23:36 +0000)]
Merge "Cleanup unsupported appusage in Telecom apis."
Jack Yu [Fri, 15 Mar 2019 23:31:06 +0000 (16:31 -0700)]
Merge "Moved transport to IntDef"
am:
b7463a63d1
Change-Id: I80d2bf5b3d195d4b05135006418ba4b638271f4f
Treehugger Robot [Fri, 15 Mar 2019 23:21:29 +0000 (23:21 +0000)]
Merge "Moved transport to IntDef"
Sasha Smundak [Fri, 15 Mar 2019 23:02:49 +0000 (16:02 -0700)]
Merge "Convert Android.mk file to Android.bp"
am:
504a33a64e
Change-Id: I464c162ef26998c2c1c968e9da36b35fa36eabb1
Pengquan Meng [Fri, 15 Mar 2019 22:58:45 +0000 (15:58 -0700)]
Merge "[API feedback] api fixed for getSlotMapping"
am:
9931252c3f
Change-Id: I68489daa92188232f3d1489226f71c14d5b2b14d
Treehugger Robot [Fri, 15 Mar 2019 22:49:30 +0000 (22:49 +0000)]
Merge "Convert Android.mk file to Android.bp"
Pengquan Meng [Fri, 15 Mar 2019 22:38:46 +0000 (22:38 +0000)]
Merge "[API feedback] api fixed for getSlotMapping"
sqian [Thu, 14 Mar 2019 20:41:33 +0000 (13:41 -0700)]
CallRedirectionService API review
Bug:
126699669
Test: Treehugger
Change-Id: I56944f6d487660ed447d081b6dfd2cb625087869
Sooraj Sasindran [Fri, 15 Mar 2019 19:53:18 +0000 (12:53 -0700)]
Merge changes from topic "Porting-ONSAPIChanges"
am:
31c7607ee6
Change-Id: Ibca8c0202ff702be57f128b0cc24a8679d0a8083
Sooraj Sasindran [Fri, 15 Mar 2019 19:46:05 +0000 (12:46 -0700)]
Provide network bands in AvailableNetworkInfo
am:
c9948da02a
Change-Id: Ib7ba8c29f8e8ed7237b5afcccf9d1694596f1263
Sooraj Sasindran [Fri, 15 Mar 2019 19:31:55 +0000 (19:31 +0000)]
Merge changes from topic "Porting-ONSAPIChanges"
* changes:
Should not turn on validation for data
Provide network bands in AvailableNetworkInfo
Fan Zhang [Fri, 15 Mar 2019 19:22:29 +0000 (12:22 -0700)]
Merge "Update feature flag mapping owners"
am:
16eab7c16d
Change-Id: I2b51778fc7ed71066d95968bfef6053659945e8c
Fan Zhang [Fri, 15 Mar 2019 19:12:37 +0000 (19:12 +0000)]
Merge "Update feature flag mapping owners"
Benedict Wong [Fri, 15 Mar 2019 17:50:06 +0000 (10:50 -0700)]
Merge "Integrate testNetworkService and Manager with Connectivity stack"
am:
b86c3255fd
Change-Id: I571e583d896841c814efe58b8c0875fa9cd3873c
Benedict Wong [Fri, 15 Mar 2019 17:41:02 +0000 (17:41 +0000)]
Merge "Integrate testNetworkService and Manager with Connectivity stack"
Cody Kesting [Fri, 15 Mar 2019 16:11:09 +0000 (09:11 -0700)]
Merge "Fix ServiceState.hashCode() bug."
am:
466ff7b990
Change-Id: I9705b0857ecc5f9a809e7e640fbc35151d244211
Cody Kesting [Fri, 15 Mar 2019 15:46:30 +0000 (15:46 +0000)]
Merge "Fix ServiceState.hashCode() bug."
Cody Kesting [Thu, 14 Mar 2019 17:35:23 +0000 (10:35 -0700)]
Fix ServiceState.hashCode() bug.
ServiceState currently overrides hashCode() incorrectly. It hashes an
Array field without using Arrays.hashCode(), meaning that the default
Object.hashCode() implementation is used (which is based on the address
of the Array field). This allows equivalent ServiceState instances to
produce different hashes.
Bug:
128609620
Test: atest CtsTelephonyTestCases:ServiceStateTest
Change-Id: I40a7d0b7ebab6d2a1be47ea63a6d223c4c13700b
Abhijeet Kaur [Fri, 15 Mar 2019 14:26:06 +0000 (07:26 -0700)]
Merge "Bugreport Manager service clear binder identity"
am:
1f6b8f50c1
Change-Id: Idc5d92ca9be7d20f57dcd6a376b96ed12cc382fc
Treehugger Robot [Fri, 15 Mar 2019 14:13:43 +0000 (14:13 +0000)]
Merge "Bugreport Manager service clear binder identity"
Nandana Dutt [Fri, 15 Mar 2019 10:39:51 +0000 (03:39 -0700)]
Merge changes I39e84219,I8d0e12cb
am:
cae221acac
Change-Id: I5fe14b5b25a1b22e184aa02e658c81d9d0238541
Treehugger Robot [Fri, 15 Mar 2019 10:28:06 +0000 (10:28 +0000)]
Merge changes I39e84219,I8d0e12cb
* changes:
Bugreporting API: Take ownership of fds.
Don't manage dumpstate lifecycle from system server
Junyu Lai [Fri, 15 Mar 2019 07:53:55 +0000 (00:53 -0700)]
Merge "[KA02.5] Use binder thread and executor to invoke callback"
am:
f9ae70a41c
Change-Id: I892d4f4dc786aa42dcbe565f345e9a731f318c8a
Junyu Lai [Fri, 15 Mar 2019 07:35:27 +0000 (07:35 +0000)]
Merge "[KA02.5] Use binder thread and executor to invoke callback"
Amit Mahajan [Fri, 15 Mar 2019 03:51:50 +0000 (20:51 -0700)]
Merge "Remove SMSDispatcher.sendData() from greylist as it's params changed"
am:
fe86a00845
Change-Id: If66d5c144751d213c7054c966af6327c45e51aa2
Remi NGUYEN VAN [Fri, 15 Mar 2019 03:46:49 +0000 (20:46 -0700)]
Merge "Initialize the NetworkStack before WiFi"
am:
6d0186de88
Change-Id: If852f57a4164d1422605c3477d036cc953179620
Treehugger Robot [Fri, 15 Mar 2019 03:42:09 +0000 (03:42 +0000)]
Merge "Remove SMSDispatcher.sendData() from greylist as it's params changed"
Jack Yu [Thu, 14 Mar 2019 22:42:09 +0000 (15:42 -0700)]
Moved transport to IntDef
Moved out from the sub class per API review feedback.
Test: Build
Bug:
128607082
Merged-In: I1b513bcaaa0ebf47c14593d962579ed48a7c6db0
Change-Id: I1b513bcaaa0ebf47c14593d962579ed48a7c6db0
Treehugger Robot [Fri, 15 Mar 2019 03:26:34 +0000 (03:26 +0000)]
Merge "Initialize the NetworkStack before WiFi"
sqian [Fri, 15 Mar 2019 02:24:32 +0000 (19:24 -0700)]
Merge "API review: Telecom outgoing call Call redirection API"
am:
bac4d5b257
Change-Id: Ia2b1be5f130c673bb691d9b54c7d9498ccd9472b
Treehugger Robot [Fri, 15 Mar 2019 02:07:46 +0000 (02:07 +0000)]
Merge "API review: Telecom outgoing call Call redirection API"
Paul Hu [Fri, 15 Mar 2019 00:56:12 +0000 (17:56 -0700)]
Merge "Rename some failed causes"
am:
f6382802ef
Change-Id: I01b6d267c4b2cbf23d6cdc2dea770f5da99fa155
Paul Hu [Fri, 15 Mar 2019 00:43:42 +0000 (00:43 +0000)]
Merge "Rename some failed causes"
Fan Zhang [Thu, 14 Mar 2019 23:25:38 +0000 (16:25 -0700)]
Update feature flag mapping owners
Test: rebuild
Change-Id: I288e039ffaf88ce271ba17bcc26f0e038314b354
Remi NGUYEN VAN [Thu, 14 Mar 2019 23:21:27 +0000 (08:21 +0900)]
Initialize the NetworkStack before WiFi
The NetworkStack needs to be marked as start requested before any client
can use it from the system server, so it knows to queue requests until
it actually comes up.
This fixes a bug introduced in commit:
I93315ad31925bd436e21d1eabb21d5967e6aae60
where a client trying to use the network stack in the system server
before ActivityManager.systemReady() could block and eventually timeout,
resulting in a null INetworkStackConnector.
Test: booted, WiFi working
Bug:
128620654
Change-Id: Ieca2657373eba78195b387fb266fa0424fce8ada
Deqiang Chen [Thu, 14 Mar 2019 22:41:33 +0000 (15:41 -0700)]
Merge "Avoid IllegalArgumentException when bluetooth is disabled"
am:
2a1bdd2429
Change-Id: I536b4ca701bed102c5c2914a6dbfa2393a646c6d
Deqiang Chen [Thu, 14 Mar 2019 22:23:18 +0000 (22:23 +0000)]
Merge "Avoid IllegalArgumentException when bluetooth is disabled"
Shuo Qian [Thu, 14 Mar 2019 22:20:03 +0000 (15:20 -0700)]
Merge "Explain the difference of isValid, isActive, isUsable"
am:
9c649215f6
Change-Id: I8146a074fa87747e91a22da4a4bfb696dcc7deef
Shuo Qian [Thu, 14 Mar 2019 22:05:46 +0000 (22:05 +0000)]
Merge "Explain the difference of isValid, isActive, isUsable"
Amit Mahajan [Wed, 13 Mar 2019 22:36:33 +0000 (15:36 -0700)]
Remove SMSDispatcher.sendData() from greylist as it's params changed
Test: none
Bug:
120403639
Merged-in: Ib70dd739d8067ca2e37f0dbc6c48a2d625935a4b
Change-Id: I0218764fc02d3f6b9f12b3480aba9742a52b8413
Abhijeet Kaur [Thu, 28 Feb 2019 11:50:27 +0000 (11:50 +0000)]
Bugreport Manager service clear binder identity
Binder identity of the caller needs to be cleared before making a call
to ensureIsPrimaryUser() and is later restored for the rest of the code
to execute.
Test: Builds
Change-Id: Ida781b633efbea57a9442fb9a8a5f823f9acbe8b
Merged-In: Ida781b633efbea57a9442fb9a8a5f823f9acbe8b
(cherry picked from commit
99766179567464860585feeb669eb01619598a50)
sqian [Tue, 30 Oct 2018 20:55:23 +0000 (13:55 -0700)]
Explain the difference of isValid, isActive, isUsable
Bug:
118675257
Test: compile
Change-Id: Ibec1bf7929991ca0e2910684f5216ab8372d4e95
Benedict Wong [Thu, 14 Mar 2019 17:59:14 +0000 (10:59 -0700)]
Merge "Add MANAGE_TEST_NETWORKS permission as @hide"
am:
96f51fd970
Change-Id: Ia5e9f3e7ba7024151d0f4fa595bf66daaa0fc948
Benedict Wong [Thu, 14 Mar 2019 17:39:21 +0000 (17:39 +0000)]
Merge "Add MANAGE_TEST_NETWORKS permission as @hide"
Nandana Dutt [Wed, 13 Mar 2019 16:42:17 +0000 (16:42 +0000)]
Bugreporting API: Take ownership of fds.
BUG:
126434607
FIXES:
127649051
Test: manual
Change-Id: I39e8421925c53061b6bc2954dffe3bccb7b3314d
junyulai [Wed, 16 Jan 2019 12:23:34 +0000 (20:23 +0800)]
[KA02.5] Use binder thread and executor to invoke callback
Currently, client side of keepalive event handling rely on a
newly created thread, looper, messenger and handler per object.
However, by creating oneway AIDL interface with the executor,
the callbacks can be invoked on the binder thread with user
specified context, which not only greatly simplify the design
but also reduce the cost of current thread modeling.
Bug:
114151147
Bug:
123969871
Test: 1. atest FrameworksNetTests --generate-new-metric 10
2. atest-deflake.sh
Change-Id: I27504074cd28d5b5eb94a7ec0e97ebaaaaa1ae3d
Nikita Ioffe [Thu, 14 Mar 2019 10:23:08 +0000 (03:23 -0700)]
Merge "Add a whitelist to control packages that can use Bugreporting API"
am:
17492d0691
Change-Id: If224c6522c89c53cb1d5e72a55d5aa051a4e0d02
Treehugger Robot [Thu, 14 Mar 2019 10:13:32 +0000 (10:13 +0000)]
Merge "Add a whitelist to control packages that can use Bugreporting API"
sqian [Wed, 13 Mar 2019 18:56:18 +0000 (11:56 -0700)]
API review: Telecom outgoing call Call redirection API
Bug:
126360354
Test: Treehugger
Change-Id: Id5b0b4aecb33ba4dc9629cc6bd2bb8836aedc653
Chen Xu [Thu, 14 Mar 2019 01:04:44 +0000 (18:04 -0700)]
Merge "fix the issue that setPreferredNW send wrong RAT to HAL"
am:
4837dbe536
Change-Id: I33e98b0f4ac9b0d7130b9e6b25fec5b76409e021
Chen Xu [Thu, 14 Mar 2019 00:47:07 +0000 (00:47 +0000)]
Merge "fix the issue that setPreferredNW send wrong RAT to HAL"
Sooraj Sasindran [Thu, 28 Feb 2019 22:46:14 +0000 (14:46 -0800)]
Should not turn on validation for data
Should not turn on validation for data switch every time.
Provide result as a callback
Test: verified manually
Bug:
126264455
Merged-In: I5df2311d91fdab34563148b4466163696e52faf9
Change-Id: I5df2311d91fdab34563148b4466163696e52faf9
Joe Onorato [Wed, 13 Mar 2019 22:01:44 +0000 (15:01 -0700)]
Merge "Add me to owners for batterystats."
am:
274ce2d831
Change-Id: I778b676a418817917421fc0794793131e5fd5d3f
Iris Chang [Wed, 13 Mar 2019 21:57:06 +0000 (14:57 -0700)]
Merge "Should return the number of supported SIM cards"
am:
09a4ee1988
Change-Id: Ia8d237fa510ca47c4fcd04a7d28812612e01d248
Treehugger Robot [Wed, 13 Mar 2019 21:45:28 +0000 (21:45 +0000)]
Merge "Add me to owners for batterystats."
Sooraj Sasindran [Thu, 7 Mar 2019 23:52:59 +0000 (15:52 -0800)]
Provide network bands in AvailableNetworkInfo
Provide network bands in AvailableNetworkInfo
Test: verified using CTS and make
Bug:
123292899
Merged-In: I0d0a180eb4da3edf50a94ba621505ad95c7a262c
Change-Id: I0d0a180eb4da3edf50a94ba621505ad95c7a262c
Hall Liu [Wed, 13 Mar 2019 21:32:28 +0000 (14:32 -0700)]
Merge "Fix issues associated with hold failure"
am:
df6e5604f3
Change-Id: I0c3ca2ef55a67b1f2c00f19635dcfd8ed0bbedea
Treehugger Robot [Wed, 13 Mar 2019 21:18:57 +0000 (21:18 +0000)]
Merge "Should return the number of supported SIM cards"
Hall Liu [Wed, 13 Mar 2019 21:18:53 +0000 (21:18 +0000)]
Merge "Fix issues associated with hold failure"
Steven Moreland [Wed, 13 Mar 2019 21:06:12 +0000 (14:06 -0700)]
Merge "Use jarjar rules for framework.jar."
am:
b70a6cbf9a
Change-Id: I85027c5a87f9acd2c67a804bcfe8c3f7346fdbc3
Steven Moreland [Wed, 13 Mar 2019 20:52:37 +0000 (20:52 +0000)]
Merge "Use jarjar rules for framework.jar."
chen xu [Wed, 13 Mar 2019 20:26:39 +0000 (13:26 -0700)]
fix the issue that setPreferredNW send wrong RAT to HAL
Bug:
126805258
Test: Manual test to set LTE only mode
Change-Id: I2e88d3bc22ca8d1e626bf381840cc80f832a8b3f
Joe Onorato [Wed, 13 Mar 2019 19:11:05 +0000 (12:11 -0700)]
Add me to owners for batterystats.
I do solemnly swear that other powers I get incidentally will be
used carefully.
Test: none
Bug:
123732427
Change-Id: I672f5f10b32646b8beb3e9692ed131019c391593
Soonil Nagarkar [Wed, 13 Mar 2019 19:03:30 +0000 (12:03 -0700)]
[automerger skipped] Merge "DO NOT MERGE Let isLocationEnabledForUser() return true location setting"
am:
a4dac05210 -s ours
am skip reason: subject contains skip directive
Change-Id: Ie3e765b2be88f06a3c97da4371f87b6c62a87f81
Treehugger Robot [Wed, 13 Mar 2019 18:52:35 +0000 (18:52 +0000)]
Merge "DO NOT MERGE Let isLocationEnabledForUser() return true location setting"
Alan Stokes [Wed, 13 Mar 2019 18:13:32 +0000 (11:13 -0700)]
Merge "Add alanstokes as owner of DynamicCodeLoggingService."
am:
b9478c48cf
Change-Id: I89f934fcf528cc30e09c9920d12d1b30d4ac5041
Treehugger Robot [Wed, 13 Mar 2019 18:01:46 +0000 (18:01 +0000)]
Merge "Add alanstokes as owner of DynamicCodeLoggingService."
Leland Miller [Wed, 13 Mar 2019 17:35:32 +0000 (10:35 -0700)]
Merge "Annotate Parcelable CREATOR fields as @NonNull"
am:
8ced10ec23
Change-Id: I89a5c242a85c0e0d19f98fc5db9fa87b0a48815a
Leland Miller [Wed, 13 Mar 2019 17:23:12 +0000 (17:23 +0000)]
Merge "Annotate Parcelable CREATOR fields as @NonNull"
Steven Moreland [Wed, 13 Mar 2019 17:11:57 +0000 (10:11 -0700)]
Merge changes from topic "hidl-updater-system"
am:
5a490d4bb7
Change-Id: I1fe4f587bb5f7452752ea3c7fc23635fb4a8aee2
Nikita Ioffe [Thu, 28 Feb 2019 21:35:02 +0000 (21:35 +0000)]
Add a whitelist to control packages that can use Bugreporting API
Test: checked SecurityException is thrown for my custom app
Test: whiltelisted my custom app, checked no SecurityException is thrown
Bug:
126541701
Change-Id: Id0b61ccc1adf40bcb455d3b59b640f4b160bdd84
Merged-In: Id0b61ccc1adf40bcb455d3b59b640f4b160bdd84
(cherry picked from commit
07964b49ac81b9955d9ecf5cf60c0bb1fc32c501)
Steven Moreland [Wed, 13 Mar 2019 16:51:30 +0000 (16:51 +0000)]
Merge changes from topic "hidl-updater-system"
* changes:
pm: AndroidHidlUpdater: system only
pm: PackageBackwardCompatibility -> applyPolicy
Siarhei Vishniakou [Wed, 13 Mar 2019 16:29:55 +0000 (09:29 -0700)]
Merge "Add Nullable annotation to getDecorView"
am:
a018254b45
Change-Id: I50847403490455560f6c7db41db494bab3bc44f8
Treehugger Robot [Wed, 13 Mar 2019 16:09:00 +0000 (16:09 +0000)]
Merge "Add Nullable annotation to getDecorView"
Nandana Dutt [Wed, 13 Mar 2019 15:17:01 +0000 (15:17 +0000)]
Don't manage dumpstate lifecycle from system server
Dumpstate now exits correctly when it's finished. So we don't have to
manage its lifecycle from system server.
BUG:
123571915
Test: manually verified dumpstate service dies
Change-Id: I8d0e12cb607cda74b5cc36e26306ea106da67ba3
Tyler Gunn [Wed, 13 Mar 2019 15:17:56 +0000 (08:17 -0700)]
Merge "Remove support for event-based handovers."
am:
b2c1daf861
Change-Id: I03aea3dffd4a7d1af24d281826f87945441d6d14
Tyler Gunn [Wed, 13 Mar 2019 15:07:06 +0000 (15:07 +0000)]
Merge "Remove support for event-based handovers."
Abhijeet Kaur [Wed, 13 Mar 2019 14:20:42 +0000 (07:20 -0700)]
Merge "Clean up bugreport API."
am:
2e44838064
Change-Id: Ib21ecea8a3dc63808784aba20f018ddd012c03c8
Treehugger Robot [Wed, 13 Mar 2019 14:07:43 +0000 (14:07 +0000)]
Merge "Clean up bugreport API."
Neil Fuller [Wed, 13 Mar 2019 13:36:30 +0000 (06:36 -0700)]
Merge "Improve documentation around HostnameVerifier"
am:
abff3f4f21
Change-Id: I7f61ebc9aa41190b6d1508fb3c511c066d3a269c
Neil Fuller [Wed, 13 Mar 2019 13:26:02 +0000 (13:26 +0000)]
Merge "Improve documentation around HostnameVerifier"
Alan Stokes [Wed, 13 Mar 2019 12:44:08 +0000 (05:44 -0700)]
Merge "Refactor OWNERS file."
am:
e27b409046
Change-Id: Ibd472d9389bd3892e0e796b284849328aae13517
Alan Stokes [Tue, 12 Mar 2019 12:51:13 +0000 (12:51 +0000)]
Add alanstokes as owner of DynamicCodeLoggingService.
As suggested by agampe on I69f415929785845ede8f2d1341f4b70f97b4f480.
Test: None.
Change-Id: Ibaac6f5d96ad9b9a343ba8940345bc7d0c8126d9
Alan Stokes [Wed, 13 Mar 2019 12:33:03 +0000 (12:33 +0000)]
Merge "Refactor OWNERS file."
Abhijeet Kaur [Fri, 8 Mar 2019 11:00:29 +0000 (11:00 +0000)]
Clean up bugreport API.
Make BugreportManager class final.
Add FloatRange annotation for BugreportManager.onProgress() function's
parameter.
Make @IntDef in BugreportMode hidden.
Bug:
126434607
Test: builds
Change-Id: I95f004106ba97bc9e99859a8b23b96a86b6a43f4
Merged-In: I95f004106ba97bc9e99859a8b23b96a86b6a43f4
Ganesh Mahendran [Wed, 13 Mar 2019 07:59:30 +0000 (00:59 -0700)]
Merge "continue read file when returned count > 0"
am:
894c578a02
Change-Id: I43f5be6a4b365e2e7ea11ae413860d9cb0c37949
Iris Chang [Wed, 13 Mar 2019 07:40:43 +0000 (15:40 +0800)]
Should return the number of supported SIM cards
When multiple SIM is enabled, getSimCount() in TelephonyManager.java
just returns 2 and it is not consistent with getPhoneCount(). For
devices which support more than 2 SIMs, it will cause
ArrayIndexOutOfBoundsException in the getInstance() function of CatService.java
when thress SIMs are present. To fix this issue, we need to return
the phone count in getSimCount() to synchronize both APIs.
Bug:
126292874
Test: check if JE is fixed on a device which supports 3 SIMs
Change-Id: I227f7d05349c1d0cf4c8bfa46c4e3b5f9bd42be9
Treehugger Robot [Wed, 13 Mar 2019 07:36:51 +0000 (07:36 +0000)]
Merge "continue read file when returned count > 0"
Chiachang Wang [Wed, 13 Mar 2019 06:58:20 +0000 (23:58 -0700)]
Merge "Support partial connectivity probe result option"
am:
da0ebedb47
Change-Id: Ia1696b640abd50b8a1e03cc6817c8e339e8ad104
Chiachang Wang [Wed, 13 Mar 2019 06:49:03 +0000 (06:49 +0000)]
Merge "Support partial connectivity probe result option"
Mathieu Chartier [Wed, 13 Mar 2019 05:44:04 +0000 (22:44 -0700)]
Merge "Call notifyStartupCompleted from reportFullyDrawn"
am:
13f15b3752
Change-Id: I6c293f77639421a5517e0c56391e60982ce8ce31
Jeremy Klein [Wed, 13 Mar 2019 05:39:53 +0000 (22:39 -0700)]
Merge "Rename entitlement callback to adhere to API guidelines."
am:
0102e3d548
Change-Id: If58d5724000fba5e1d794a98ccc89b73ce842f4a
Xiangyu/Malcolm Chen [Wed, 13 Mar 2019 05:35:39 +0000 (22:35 -0700)]
Merge "Only return one mobile subscription per group in Settings."
am:
58385e9796
Change-Id: I2133bd9ba315a862a25fdd65afd981cbe34d5e62
Stanley Tng [Wed, 13 Mar 2019 05:30:47 +0000 (22:30 -0700)]
Merge "Add @NonNull annotations to LE CoC APIs"
am:
8b57ab7989
Change-Id: I16c1d5c6c7c31b0c96172f0baaed361eae8f4a5e
Xin Li [Wed, 13 Mar 2019 05:17:07 +0000 (22:17 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190305.001 into master"
am:
a5fe44c6b5 -s ours
am skip reason: subject contains skip directive
Change-Id: I1ef13e9b82d2f5b55a603c00105fbc6fb392dcc8
OSDN Git Service
