OSDN Git Service
Abhijeet Kaur [Fri, 15 Mar 2019 14:35:12 +0000 (07:35 -0700)]
Merge "Bugreport Manager service clear binder identity" am:
1f6b8f50c1
am:
32538e15a3
Change-Id: I50615918e195f60790ff6f9cadf2cfc063a682f8
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:47:20 +0000 (03:47 -0700)]
Merge changes I39e84219,I8d0e12cb am:
cae221acac
am:
20324711c0
Change-Id: I6d345de879380cd2797008efa79e3befa978f136
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 08:10:46 +0000 (01:10 -0700)]
Merge "[KA02.5] Use binder thread and executor to invoke callback" am:
f9ae70a41c
am:
1ed9d716fc
Change-Id: I259ff770ce491d9dec5d136202bebf08e6de58e2
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 04:11:52 +0000 (21:11 -0700)]
Merge "Remove SMSDispatcher.sendData() from greylist as it's params changed" am:
fe86a00845
am:
c911bc365e
Change-Id: Ia8a438259b450a1302f6d57e398dc9c99d69e1d8
Remi NGUYEN VAN [Fri, 15 Mar 2019 03:58:16 +0000 (20:58 -0700)]
Merge "Initialize the NetworkStack before WiFi" am:
6d0186de88
am:
b07d868c53
Change-Id: I65ed1eb721d194c34fc475b461b28386eee206e0
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"
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:34:59 +0000 (19:34 -0700)]
Merge "API review: Telecom outgoing call Call redirection API" am:
bac4d5b257
am:
bcd431fd2f
Change-Id: Ib8f4bd78be6f47a489278359bb2838e6d1a4bbe6
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 01:06:24 +0000 (18:06 -0700)]
Merge "Rename some failed causes" am:
f6382802ef
am:
4a862a637a
Change-Id: I0b9b904da6749028a6c8441550583a15a7acde4e
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"
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:53:21 +0000 (15:53 -0700)]
Merge "Avoid IllegalArgumentException when bluetooth is disabled" am:
2a1bdd2429
am:
787e52045f
Change-Id: I3f55d6e7b56170ee4cafaf60e7ef8b908080c182
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
Shuo Qian [Thu, 14 Mar 2019 22:30:10 +0000 (15:30 -0700)]
Merge "Explain the difference of isValid, isActive, isUsable" am:
9c649215f6
am:
614f1e0bba
Change-Id: Ia4f968479973a9fb5f1ccdf78145d7fc2429ef0a
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 18:15:14 +0000 (11:15 -0700)]
Merge "Add MANAGE_TEST_NETWORKS permission as @hide" am:
96f51fd970
am:
7a66b02e62
Change-Id: I1999d3c8c517f3f1369005b986f18105ef793dab
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:34:30 +0000 (03:34 -0700)]
Merge "Add a whitelist to control packages that can use Bugreporting API" am:
17492d0691
am:
e54c0344de
Change-Id: I8545743ebce6206b2b8d747eb252a31282bc86cf
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:13:58 +0000 (18:13 -0700)]
Merge "fix the issue that setPreferredNW send wrong RAT to HAL" am:
4837dbe536
am:
3a720c6739
Change-Id: I2245e9a0fd7afac8835dbf1ead499153efa39e36
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"
Todd Kennedy [Wed, 13 Mar 2019 23:49:14 +0000 (16:49 -0700)]
Change target SDK to '28'
am:
b0103b5ebb
Change-Id: If4e9acb9fef17a38013d532196a06091446f5bb2
Joe Onorato [Wed, 13 Mar 2019 22:14:10 +0000 (15:14 -0700)]
Merge "Add me to owners for batterystats." am:
274ce2d831
am:
b5c0c5b1e8
Change-Id: Ifc47542faa17acc3da46826da0da09c981fc5066
Iris Chang [Wed, 13 Mar 2019 22:08:01 +0000 (15:08 -0700)]
Merge "Should return the number of supported SIM cards" am:
09a4ee1988
am:
52688c33ee
Change-Id: I122d3f77a55ae27005531bfe490ad35213892b4f
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
Hall Liu [Wed, 13 Mar 2019 21:45:42 +0000 (14:45 -0700)]
Merge "Fix issues associated with hold failure" am:
df6e5604f3
am:
9fefce6df5
Change-Id: Ib736c4b26fac7262727873cdccd510927226f8f9
Treehugger Robot [Wed, 13 Mar 2019 21:45:28 +0000 (21:45 +0000)]
Merge "Add me to owners for batterystats."
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
Steven Moreland [Wed, 13 Mar 2019 21:20:38 +0000 (14:20 -0700)]
Merge "Use jarjar rules for framework.jar." am:
b70a6cbf9a
am:
4382755210
Change-Id: Ib36a2c578ce37876dd1c544f471987b9a32bdc5a
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."
Todd Kennedy [Fri, 1 Mar 2019 21:56:47 +0000 (13:56 -0800)]
Change target SDK to '28'
Bug:
121306802
Test: none
Change-Id: I3e7302ab42987c177f9e538fd7fdf66c35f0bb79
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:10:26 +0000 (12:10 -0700)]
[automerger skipped] Merge "DO NOT MERGE Let isLocationEnabledForUser() return true location setting" am:
a4dac05210 -s ours
am:
99d0681a6f -s ours
am skip reason: subject contains skip directive
Change-Id: I330716725c4672c60aaa44c9d5d30a241832a2fa
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:25:55 +0000 (11:25 -0700)]
Merge "Add alanstokes as owner of DynamicCodeLoggingService." am:
b9478c48cf
am:
5b2f518c5a
Change-Id: I38ead254c408e312395629db68b40479fc6403c9
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:45:36 +0000 (10:45 -0700)]
Merge "Annotate Parcelable CREATOR fields as @NonNull" am:
8ced10ec23
am:
83c77f688a
Change-Id: Idbe3b03a8345db85b7e32d4e7198a78c1df42270
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:21:31 +0000 (10:21 -0700)]
Merge changes from topic "hidl-updater-system" am:
5a490d4bb7
am:
cfea213006
Change-Id: Ida737ee8bdadbacc656e9f6b96f29d793089e695
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:39:19 +0000 (09:39 -0700)]
Merge "Add Nullable annotation to getDecorView" am:
a018254b45
am:
b812cec859
Change-Id: I13b43231caaca17dfa3f67c9d77c0792a77f6e3b
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"
Tyler Gunn [Wed, 13 Mar 2019 15:27:02 +0000 (08:27 -0700)]
Merge "Remove support for event-based handovers." am:
b2c1daf861
am:
3e232b28af
Change-Id: I6119eb289794ac658196fd7b25863c1404807fc3
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:30:03 +0000 (07:30 -0700)]
Merge "Clean up bugreport API." am:
2e44838064
am:
8deb2ecb31
Change-Id: I9054327b5f9b072986dd2d7ef5b38716138132c9
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:46:05 +0000 (06:46 -0700)]
Merge "Improve documentation around HostnameVerifier" am:
abff3f4f21
am:
3ffddc2444
Change-Id: I28dc49eeeda3132762f10a57c36c826bbe5df888
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:53:20 +0000 (05:53 -0700)]
Merge "Refactor OWNERS file." am:
e27b409046
am:
fa974346e4
Change-Id: If69a9fcfd2d061b7d93afe0bf1c8126d0a4bb464
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 08:15:04 +0000 (01:15 -0700)]
Merge "continue read file when returned count > 0" am:
894c578a02
am:
2a82e9a69c
Change-Id: I2880bdc9157996d30472e3eddb714c498b14e66b
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 07:07:49 +0000 (00:07 -0700)]
Merge "Support partial connectivity probe result option" am:
da0ebedb47
am:
cca7cdc8d9
Change-Id: Ic1ea01ee3d6ac2f01f843fbf71684b6f7b21bd41
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 06:42:36 +0000 (23:42 -0700)]
Merge "Call notifyStartupCompleted from reportFullyDrawn" am:
13f15b3752
am:
96040ee591
Change-Id: I4aed2c47bd05a303acafbfc314eb9355a6491604
Jeremy Klein [Wed, 13 Mar 2019 06:36:36 +0000 (23:36 -0700)]
Merge "Rename entitlement callback to adhere to API guidelines." am:
0102e3d548
am:
33a9d34e8a
Change-Id: I29bbf7cbbc0d87a9831762342d81496e6983df68
Xiangyu/Malcolm Chen [Wed, 13 Mar 2019 06:13:05 +0000 (23:13 -0700)]
Merge "Only return one mobile subscription per group in Settings." am:
58385e9796
am:
c078d39d46
Change-Id: I748be95d8cf99ac03457ac740829cf5855331444
OSDN Git Service
