OSDN Git Service
Brad Ebinger [Mon, 19 Mar 2018 22:33:01 +0000 (22:33 +0000)]
Merge "Add empty CdmaSmsSubaddress to CDMA PDU parsing"
am:
78a7b5d44a
Change-Id: If11be7e1ee331ca17ab4a18270faa47c0b7798a6
Andreas Gampe [Mon, 19 Mar 2018 21:24:24 +0000 (21:24 +0000)]
Merge "Frameworks: Handle exceptions in SystemProperties callbacks"
am:
af3dc4fc70
Change-Id: Ib7b56bb493be1053d2277a68a1d64010eb7d6033
Treehugger Robot [Mon, 19 Mar 2018 21:04:56 +0000 (21:04 +0000)]
Merge "Add empty CdmaSmsSubaddress to CDMA PDU parsing"
Ajay Panicker [Mon, 19 Mar 2018 20:03:32 +0000 (20:03 +0000)]
Merge "Add the AVRCP Target Service (2/2)"
am:
61265410e8
Change-Id: I6174f0e40d0a9bcb0f079b1f0ff87b3a5188bfef
Treehugger Robot [Mon, 19 Mar 2018 19:38:13 +0000 (19:38 +0000)]
Merge "Frameworks: Handle exceptions in SystemProperties callbacks"
Treehugger Robot [Mon, 19 Mar 2018 18:38:40 +0000 (18:38 +0000)]
Merge "Add the AVRCP Target Service (2/2)"
Tyler Gunn [Mon, 19 Mar 2018 18:36:10 +0000 (18:36 +0000)]
Merge "Rename handover failure constant per API review comments."
am:
7c8a877231
Change-Id: Ic3cd64d00f6c5a44acb9f6913fe728bd252fa99a
Bruno Martins [Mon, 19 Mar 2018 18:29:17 +0000 (18:29 +0000)]
Merge "DndTile: Avoid yet another NPE during boot up phase"
am:
2446a10799
Change-Id: I211f94c3dedc4f288d436ba3aff7f52309a994d3
Tyler Gunn [Mon, 19 Mar 2018 17:15:58 +0000 (17:15 +0000)]
Merge "Rename handover failure constant per API review comments."
Treehugger Robot [Mon, 19 Mar 2018 16:31:29 +0000 (16:31 +0000)]
Merge "DndTile: Avoid yet another NPE during boot up phase"
Andreas Gampe [Fri, 16 Mar 2018 23:14:29 +0000 (16:14 -0700)]
Frameworks: Handle exceptions in SystemProperties callbacks
When notifying callbacks, catch thrown exceptions.
Bug:
73058952
Test: m
Test: atest SystemPropertiesTest
Change-Id: I1c61e11b833e8ddd30d80b9859b20a9fb3185a33
Bruno Martins [Sat, 17 Mar 2018 13:55:42 +0000 (13:55 +0000)]
DndTile: Avoid yet another NPE during boot up phase
* Tile state update can only take place once mController
is properly initialized.
Change-Id: Ia6c1d6dee7d3e396a5bb6910e03859a0c0cc94ae
nharold [Sat, 17 Mar 2018 02:00:57 +0000 (02:00 +0000)]
Merge "Docstring Updates for applyTransportModeTransform"
am:
00ef20e853
Change-Id: I2b59ebf0b751f7f404d175ad394a4dfdbf7169ff
nharold [Sat, 17 Mar 2018 00:33:10 +0000 (00:33 +0000)]
Merge "Docstring Updates for applyTransportModeTransform"
Nathan Harold [Tue, 6 Mar 2018 21:22:22 +0000 (13:22 -0800)]
Docstring Updates for applyTransportModeTransform
-Add anotations to usages of PolicyDirection for
apply...() methods.
-Update the comments on DIRECTION_IN and DIRECTION_OUT
to better reflect their current usage.
-Add a better explanation to the rekey procedure doc.
-Remove disused createTunnelInterface() stub.
Bug:
73751066
Test: make docs
Change-Id: I9f2ec864466148a18899f1e952c74a525902ccbc
Jack Yu [Fri, 16 Mar 2018 23:07:24 +0000 (23:07 +0000)]
Merge "Renamed getNetworkId and getSystemId"
am:
5b7103ab97
Change-Id: Ica71497d03bf2752cac6a4af7bc9890a0bb3596f
Jack Yu [Fri, 16 Mar 2018 21:50:19 +0000 (21:50 +0000)]
Merge "Renamed getNetworkId and getSystemId"
Ruchi Kandoi [Fri, 16 Mar 2018 21:28:18 +0000 (21:28 +0000)]
Merge "NfcAdapter.EXTRA_SE_NAME -> NfcAdapter.EXTRA_SECURE_ELEMENT_NAME"
am:
01cef932c8
Change-Id: Ic8c8b5566a4278af7ecf745d4b3c8d18a1d848b7
Brad Ebinger [Fri, 16 Mar 2018 20:49:52 +0000 (20:49 +0000)]
Merge "Define phone process as a constant"
am:
465fdc2b25
Change-Id: I4414b2e40dcaa459d8c9209082f66c9656013e50
Brad Ebinger [Fri, 16 Mar 2018 20:33:57 +0000 (20:33 +0000)]
Merge "Added Locking for MmTelFeature"
am:
d273dea10b
Change-Id: Iec9f34bb85d4f04349690799b6d69b4061950bb0
Treehugger Robot [Fri, 16 Mar 2018 20:12:04 +0000 (20:12 +0000)]
Merge "NfcAdapter.EXTRA_SE_NAME -> NfcAdapter.EXTRA_SECURE_ELEMENT_NAME"
Tyler Gunn [Fri, 16 Mar 2018 16:53:44 +0000 (09:53 -0700)]
Rename handover failure constant per API review comments.
Expanding EMERG to EMERGENCY.
Test: Build code
Bug:
74831393
Change-Id: Ib7e6bea84e25b1e1a2ddb154c7ed62f1084a7596
Jack Yu [Fri, 16 Mar 2018 19:36:31 +0000 (19:36 +0000)]
Merge "Added CTS test cases for getNetworkId() and getSystemId()"
am:
a9c0419010
Change-Id: I6bc4d056458e7c57729c0b37b7867ad08fe8d637
yinxu [Fri, 16 Mar 2018 19:31:26 +0000 (19:31 +0000)]
Merge "Use AsyncTask.SERIAL_EXECUTOR as the default executor for scan"
am:
cdbf930883
Change-Id: Icd89a86250d28c271f0a3ba2dc1553b313ace646
Anthony Stange [Fri, 16 Mar 2018 19:29:03 +0000 (19:29 +0000)]
Merge "Add scan background mode to Settings.Global."
am:
3aa064897e
Change-Id: I2993a751fbf17b561f770307f199ab1c1d4469b8
Brad Ebinger [Fri, 16 Mar 2018 18:38:30 +0000 (18:38 +0000)]
Merge "Define phone process as a constant"
Brad Ebinger [Thu, 15 Mar 2018 22:18:57 +0000 (15:18 -0700)]
Add empty CdmaSmsSubaddress to CDMA PDU parsing
We were not providing an empty subaddress when
parsing CDMA PDU, which caused an NPE when receiving
CDMA IMS SMS.
Bug:
73994015
Test: Manual, MT/MO SMS
Change-Id: I07be3ac64341eb9235f6da1b6870ac746188f73a
Ajay Panicker [Fri, 16 Mar 2018 11:00:27 +0000 (04:00 -0700)]
Add the AVRCP Target Service (2/2)
Add the AVRCP Target constant to Bluetooth Profile. Also remove redundant
public static final modifier on the constants.
Bug:
68854188
Test: Compiles and local test with service enabled
Change-Id: If2ec607fc704c225f8903d438fe970dfafac25f1
Brad Ebinger [Fri, 16 Mar 2018 18:21:07 +0000 (18:21 +0000)]
Merge "Added Locking for MmTelFeature"
Jack Yu [Thu, 15 Mar 2018 20:51:05 +0000 (13:51 -0700)]
Renamed getNetworkId and getSystemId
1. Renamed getNetworkId() to getCdmaNetworkId()
2. Renamed getSystemId() to getCdmaSystemId()
Test: Build
Bug:
74976831
Merged-In: I2a5fb50a59c3239bd3dca5568991a9dff08839fc
Change-Id: I2a5fb50a59c3239bd3dca5568991a9dff08839fc
(cherry picked from commit
2661fac133db49124d2377f49506b12c1a6c9505)
Treehugger Robot [Fri, 16 Mar 2018 17:39:38 +0000 (17:39 +0000)]
Merge "Added CTS test cases for getNetworkId() and getSystemId()"
Treehugger Robot [Fri, 16 Mar 2018 17:23:53 +0000 (17:23 +0000)]
Merge "Use AsyncTask.SERIAL_EXECUTOR as the default executor for scan"
Treehugger Robot [Fri, 16 Mar 2018 16:15:50 +0000 (16:15 +0000)]
Merge "Add scan background mode to Settings.Global."
Anthony Stange [Wed, 14 Mar 2018 01:09:45 +0000 (01:09 +0000)]
Add scan background mode to Settings.Global.
This enables us to mess with the different scan intervals and shift
clients to a different scan mode in the background based on what scan
interval values we choose for the different power modes.
Bug:
71765044
Test: None. Just adding a key.
Change-Id: Id48ebc521dd3fe8a68c9c4c0bdb1018ea5b3743e
Jack Yu [Fri, 23 Feb 2018 01:37:38 +0000 (17:37 -0800)]
Added CTS test cases for getNetworkId() and getSystemId()
Bug:
32718590
Test: atest CtsTelephonyTestCases:ServiceStateTest#testServiceState
Merged-In: I5826a59d85028f0350ee39c69553f4e488d6456b
Change-Id: I5826a59d85028f0350ee39c69553f4e488d6456b
(cherry picked from commit
1b8b38928b4e20e7e66ab75e39159b158dc5c4c9)
Chen Xu [Fri, 16 Mar 2018 02:06:17 +0000 (02:06 +0000)]
Merge "reword title of CS rejection notification"
am:
790e4f475f
Change-Id: Ief67959059827ace01249305f7d25fe3ed83308b
Miao-chen Chou [Fri, 16 Mar 2018 01:13:07 +0000 (01:13 +0000)]
Merge "Bluetooth: preserve one advertisement slot for GMS core"
am:
00cc1847d3
Change-Id: I5a6d39107b49690e11afd8c7e394554fbf616e11
Chen Xu [Fri, 16 Mar 2018 00:51:04 +0000 (00:51 +0000)]
Merge "reword title of CS rejection notification"
Treehugger Robot [Thu, 15 Mar 2018 23:50:49 +0000 (23:50 +0000)]
Merge "Bluetooth: preserve one advertisement slot for GMS core"
fionaxu [Sat, 18 Nov 2017 01:07:14 +0000 (17:07 -0800)]
reword title of CS rejection notification
Device will show a notification when receive MM rejection code from
Network due to CS registration failure. Notification message is
confusing today as it doesn't specify the domain that's being blocked.
The fix is explicitly specifying voice service impact for various MM
rejection code.
(cherry picked from commit
a6b9fda6245d21ac9e7370a8d8dd13deff73458c)
Bug:
67754753
Test: Manual
Change-Id: Ia5e93a26f8dccfc18c9dcb63b773e5b23734fd0d
(cherry picked from commit
de9d7784ec5879f1d9bebb8851f3b0e82fa82333)
Merged-in: I656ba438659aedce7f56f167707a12ce07286594
Ruchi Kandoi [Thu, 15 Mar 2018 22:15:18 +0000 (15:15 -0700)]
NfcAdapter.EXTRA_SE_NAME -> NfcAdapter.EXTRA_SECURE_ELEMENT_NAME
Test: compiles
Bug:
74976874
Change-Id: Ied783f57078aaa37017cc821adf329ececac74f3
Chen Xu [Thu, 15 Mar 2018 21:46:59 +0000 (21:46 +0000)]
Merge "rename notifications from carrierServiceStateTracker"
am:
6a7bb0694f
Change-Id: I2df44b61548efb65e872867b6feabec9da80e3a8
Jack Yu [Thu, 15 Mar 2018 20:39:46 +0000 (20:39 +0000)]
Merge "Fixed data connection state callback not working"
am:
28d076b829
Change-Id: If14c65c653f9665941985a71a60310cad2395265
yinxu [Thu, 15 Mar 2018 18:39:15 +0000 (11:39 -0700)]
Use AsyncTask.SERIAL_EXECUTOR as the default executor for scan
Because there will be multiple callbacks for each scan and they must be
invoked with the same order as they are received by the platform, we
should use AsyncTask.SERIAL_EXECUTOR instead of
AsyncTask.THREAD_POOL_EXECUTOR as the default executor.
Bug:
74840070
Test: Unit Test, CTS Test
Change-Id: I7333940dad38f7e400a4124486bdb21cea0d5220
Chen Xu [Thu, 15 Mar 2018 20:19:48 +0000 (20:19 +0000)]
Merge "rename notifications from carrierServiceStateTracker"
Treehugger Robot [Thu, 15 Mar 2018 19:04:30 +0000 (19:04 +0000)]
Merge "Fixed data connection state callback not working"
fionaxu [Thu, 15 Mar 2018 01:33:47 +0000 (18:33 -0700)]
rename notifications from carrierServiceStateTracker
Bug:
37578776
Bug:
72712198
Test: Manual
Change-Id: Ifcf670c03f3777e08f03c1a4f0c3f3d6092192b2
(cherry picked from commit
8683f651388ebc4ba063f6e21afb8ceff23c58a0)
Merged-in: Ifcf670c03f3777e08f03c1a4f0c3f3d6092192b2
Mathew Inwood [Thu, 15 Mar 2018 18:16:57 +0000 (18:16 +0000)]
Merge "Amend package whitelist."
am:
e70b94815a
Change-Id: Id1ba1faec336422406c47848790180173a12b3c6
Jack Yu [Wed, 14 Mar 2018 23:23:38 +0000 (16:23 -0700)]
Fixed data connection state callback not working
The old behavior of onDataConnectionStateChanged callback is that
if at least one data connection for one APN type (e.g. default,
mms, supl, ims, etc...) is connected, then it reports connected.
It only reports disconnected if data for all APN types are
disconnected.
Since now we have data connections are always connected. For example,
even if the user disables data, the unmetered IMS data remains
connected. In this case the client's onDataConnectionStateChanged
won't be called.
Now we changed the behavior of onDataConnectionStateChanged to
report the connection state for default APN type only. This matches
the behavior of TelephonyManager.getDataState().
Test: Manual
Bug:
73226433
Merged-In: I0744cf33337864c946af6e7d186bab78584acfa4
Change-Id: I0744cf33337864c946af6e7d186bab78584acfa4
(cherry picked from commit
b1bac54d609703ec5fbc633fab89c73994289496)
Andreas Gampe [Thu, 15 Mar 2018 17:10:15 +0000 (17:10 +0000)]
Merge "Frameworks: Fix system server profiling"
am:
eed99d8629
Change-Id: Ia07782e694d066f827e99fffa49c93321444b851
Treehugger Robot [Thu, 15 Mar 2018 16:42:10 +0000 (16:42 +0000)]
Merge "Amend package whitelist."
Treehugger Robot [Thu, 15 Mar 2018 15:36:28 +0000 (15:36 +0000)]
Merge "Frameworks: Fix system server profiling"
Mathew Inwood [Thu, 15 Mar 2018 14:05:53 +0000 (14:05 +0000)]
Amend package whitelist.
Now that Antons cleanup of all packages is complete, we can generate this
whitelist from those packages that specify
LOCAL_PRIVATE_PLATFORM_APIS := true
This is the resulting list of packages. This change also includes fixes to
the method; previously, packges that didn't specify any certificate may
have been exluded.
Test: Verify that device boots.
Change-Id: I1f578322135274b80708d4bb7664f7732ac33cc7
Colin Cross [Thu, 15 Mar 2018 06:47:37 +0000 (06:47 +0000)]
Merge "Revert "Add RequestShortAudioDescriptorAction. [1/2]""
am:
79fe334055
Change-Id: If3575ef82b34e5685b5fed36f7cb0a7e2e6e0d93
Andreas Gampe [Thu, 15 Mar 2018 06:13:28 +0000 (23:13 -0700)]
Frameworks: Fix system server profiling
Avoid a race to close the profiling file descriptor.
Bug:
74883338
Test: m
Test: am profile start `pid system_server` /data/local/tmp/test.trace && sleep 5s && am profile stop `pid system_server` && adb pull /data/local/tmp/test.trace && [[ $(find test.trace -size +1K) ]] && echo Success
Change-Id: Ib506ce38ac1ac7c0b91079ba9b35aca6ae289d22
Colin Cross [Thu, 15 Mar 2018 05:25:39 +0000 (05:25 +0000)]
Merge "Revert "Add RequestShortAudioDescriptorAction. [1/2]""
Colin Cross [Thu, 15 Mar 2018 05:24:49 +0000 (05:24 +0000)]
Revert "Add RequestShortAudioDescriptorAction. [1/2]"
This reverts commit
9e16580f78a6621c8957f427b6d9b8fadc813afd.
Reason for revert: Broke all the builds.
Change-Id: If2b8a0a36d6e2a902c33a66b82b11f693d7f7139
Dan Zhang [Thu, 15 Mar 2018 03:35:12 +0000 (03:35 +0000)]
Merge "Add RequestShortAudioDescriptorAction. [1/2]"
am:
c27ebbaa8f
Change-Id: Iffeeccf9056131edb8921a1597b3b34b320cd747
Dan Zhang [Thu, 15 Mar 2018 01:49:37 +0000 (01:49 +0000)]
Merge "Add RequestShortAudioDescriptorAction. [1/2]"
Miao-chen Chou [Wed, 14 Mar 2018 22:00:23 +0000 (15:00 -0700)]
Bluetooth: preserve one advertisement slot for GMS core
This brings back the check on the multiple advertisement support before
granting any Bluetooth LE advertiser. In other words, one slot is preserved
for GMS core.
Bug:
74819586
Test: Run an BLE application and verify the number of advertisements
Change-Id: Iac3b47c76c6f699018982a69e9b04a9d8c631bfb
Qingxi Li [Wed, 14 Mar 2018 23:17:14 +0000 (23:17 +0000)]
Merge "Add API to check extended APDU Supported"
am:
fd4385e633
Change-Id: I8f5441a58b8ca8b8aa2aa6138716c08749d6b814
Brad Ebinger [Wed, 14 Mar 2018 23:14:55 +0000 (16:14 -0700)]
Define phone process as a constant
Test: Manual
Bug:
72645729
Change-Id: If07728ea2cc0128113ebe947a154f80ff45a7d9d
Treehugger Robot [Wed, 14 Mar 2018 21:59:58 +0000 (21:59 +0000)]
Merge "Add API to check extended APDU Supported"
yinxu [Wed, 14 Mar 2018 21:56:40 +0000 (21:56 +0000)]
Merge "Catch the RuntimeException for stopScan()"
am:
0715570648
Change-Id: I751b4640654826499a9885db657bc0f4da2358f1
yinxu [Wed, 14 Mar 2018 20:53:38 +0000 (20:53 +0000)]
Merge "Fix a bug when calling onError(int)"
am:
d116852e69
Change-Id: Ic55c4b394a97686c77da0652b751d3712b730446
Treehugger Robot [Wed, 14 Mar 2018 19:47:44 +0000 (19:47 +0000)]
Merge "Catch the RuntimeException for stopScan()"
Treehugger Robot [Wed, 14 Mar 2018 19:46:51 +0000 (19:46 +0000)]
Merge "Fix a bug when calling onError(int)"
yinxu [Mon, 12 Mar 2018 21:07:49 +0000 (14:07 -0700)]
Fix a bug when calling onError(int)
The lambda expression is executed on executor, so it is possible that
the message has been updated. The correct way is to fetch the
message.arg1 and use that value in the lamda expression.
This is a clean cherry-pick from
https://googleplex-android-review.git.corp.google.com/c/platform/frameworks/base/+/
3725360
Bug:
73750871
Test: Unit Test
Change-Id: Id13f5fabf7eaad6970ab66a83a17aba7f1eebfce
Merged-in: Id13f5fabf7eaad6970ab66a83a17aba7f1eebfce
(cherry picked from commit
db18cdae661b87ff2de3847947906da735f8d5eb)
yinxu [Mon, 12 Mar 2018 22:55:28 +0000 (15:55 -0700)]
Catch the RuntimeException for stopScan()
Some RuntimeExceptions will be thrown across the binder so we need to
catch RuntimeException even we already catch the RemoteException.
This is a clean cherry-pick from
https://googleplex-android-review.git.corp.google.com/c/platform/frameworks/base/+/
3725821
Bug:
73750871
Test: Unit Test
Change-Id: Ib72e5ce0f20fbbe913b054314ed3942862c0ab95
Merged-in: Ib72e5ce0f20fbbe913b054314ed3942862c0ab95
(cherry picked from commit
7ea1a49c0aa1bb9bd990060a193507e5e4d0c292)
Andreas Gampe [Wed, 14 Mar 2018 18:10:20 +0000 (18:10 +0000)]
Merge changes I14df050f,I55c30f78,I269eae0f
am:
ad7415f11e
Change-Id: I3754b49159f7e23df8e95b03b3b88cc0908d554e
Tyler Gunn [Wed, 14 Mar 2018 17:12:56 +0000 (17:12 +0000)]
Merge "Update API docs for Telephony call state reporting."
am:
c2493ee1ee
Change-Id: Ib57ff8f80d17324c159f8ae0839134c0b6aecac0
Treehugger Robot [Wed, 14 Mar 2018 15:35:41 +0000 (15:35 +0000)]
Merge changes I14df050f,I55c30f78,I269eae0f
* changes:
Frameworks: Refactor FileDescriptorTable errors
Frameworks: Add app name to zygote abort
Frameworks: Refactor zygote abort code
Tyler Gunn [Wed, 14 Mar 2018 14:59:52 +0000 (14:59 +0000)]
Merge "Update API docs for Telephony call state reporting."
David Brazdil [Wed, 14 Mar 2018 11:49:20 +0000 (11:49 +0000)]
Merge "Add PrintRecommendationService to hidden API package whitelist"
am:
c19970fdcf
Change-Id: I33b7548a05a839c25db36f66ba2f41f04cbde486
Treehugger Robot [Wed, 14 Mar 2018 10:09:00 +0000 (10:09 +0000)]
Merge "Add PrintRecommendationService to hidden API package whitelist"
Tej Singh [Wed, 14 Mar 2018 03:22:57 +0000 (03:22 +0000)]
Merge "DO NOT MERGE: Add to dummy StatsLog class"
am:
21954067ba -s ours
Change-Id: I87e430664f6c7093ca35b0fd887c63d083bee1c3
Jeff Davidson [Wed, 14 Mar 2018 01:44:36 +0000 (01:44 +0000)]
Merge "Allow carrier privileged apps to access Telephony/Subscription APIs."
am:
985b17957a
Change-Id: If78aeb482eaadc3bce939c3d670e0619ca715029
Qingxi Li [Wed, 7 Mar 2018 18:50:02 +0000 (10:50 -0800)]
Add API to check extended APDU Supported
Add API UiccSlotInfo#getIsExtendedApduSupported
Bug:
68999147
Test: TreeHugger & E2E
Change-Id: Ia400a23c35332356deaa214861f6f5ffe47c8092
Merged-In: Ia400a23c35332356deaa214861f6f5ffe47c8092
fionaxu [Wed, 14 Mar 2018 01:39:13 +0000 (01:39 +0000)]
Merge "access bar notification rename"
am:
d96e1e408d
Change-Id: I1506d56002822d82e1ffc90c928b4ea9fc362d60
Treehugger Robot [Wed, 14 Mar 2018 01:21:43 +0000 (01:21 +0000)]
Merge "DO NOT MERGE: Add to dummy StatsLog class"
Treehugger Robot [Wed, 14 Mar 2018 00:10:12 +0000 (00:10 +0000)]
Merge "Allow carrier privileged apps to access Telephony/Subscription APIs."
Treehugger Robot [Wed, 14 Mar 2018 00:01:54 +0000 (00:01 +0000)]
Merge "access bar notification rename"
Tyler Gunn [Tue, 13 Mar 2018 22:56:37 +0000 (15:56 -0700)]
Update API docs for Telephony call state reporting.
Update TelephonyManager#getCallState,
PhoneStateListener#onCallStateChanged to make it clear which calls each
method considers in determining call state.
Added intdef for call state (allows auto doc generation of valid
values for parameters).
Test: make docs
Bug:
73245376
Change-Id: I70ebd0f00ae3f0e1370ae275be8f8ef6f008523d
Tej Singh [Sat, 10 Mar 2018 02:04:50 +0000 (18:04 -0800)]
DO NOT MERGE: Add to dummy StatsLog class
Changing some of the atoms, so changing the corresponding write method.
Test: build on Marlin
Change-Id: I0fe8418caad7df97dc8f9fed13a9dc423d9c50f6
Hall Liu [Tue, 13 Mar 2018 21:41:52 +0000 (21:41 +0000)]
Merge "Add IntDef for MBMS download result"
am:
54b8ab7333
Change-Id: Ia693a91d744246a6ee390c7f43bc243c893d50bf
fionaxu [Tue, 13 Mar 2018 01:26:05 +0000 (18:26 -0700)]
access bar notification rename
Bug:
37579161
Test: Build
Change-Id: I609826de47dc3fae4dee89d43951269a462c22b2
(cherry picked from commit
d97c30af9410aafa93bae9ff01b4d9d61a15dee3)
Merged-in: I609826de47dc3fae4dee89d43951269a462c22b2
fionaxu [Tue, 13 Mar 2018 20:24:49 +0000 (20:24 +0000)]
Merge "Carrier id api rename"
am:
57479b64b7
Change-Id: I44bd557cd89db9152c1bd66c8ee02b7ab45ec989
Hall Liu [Tue, 13 Mar 2018 20:10:38 +0000 (20:10 +0000)]
Merge "Add IntDef for MBMS download result"
Ruchi Kandoi [Tue, 13 Mar 2018 20:08:36 +0000 (20:08 +0000)]
Merge "Remove the UICC specific code from android.se.omapi"
am:
56be32e1ce
Change-Id: I458cfa98edde0176f84d858fb55e110647f06774
Hall Liu [Tue, 13 Mar 2018 18:29:33 +0000 (11:29 -0700)]
Add IntDef for MBMS download result
Change-Id: Idd8434e65691fc5d08f5427add6aec1870b76619
Fixes:
74409057
Test: compiles, no functionality change
Treehugger Robot [Tue, 13 Mar 2018 18:28:50 +0000 (18:28 +0000)]
Merge "Carrier id api rename"
Brad Ebinger [Tue, 13 Mar 2018 18:04:23 +0000 (18:04 +0000)]
Merge "Remove unneeded notify AIDL API"
am:
991f8b0c34
Change-Id: Ibef00fa1b9d1f4c964798c66af86059d73e2e707
Ruchi Kandoi [Tue, 13 Mar 2018 17:56:26 +0000 (17:56 +0000)]
Merge "Remove the UICC specific code from android.se.omapi"
Brad Ebinger [Tue, 13 Mar 2018 17:53:51 +0000 (17:53 +0000)]
Merge "Remove IMS Emergency Calling availability API"
am:
4b10333c26
Change-Id: I8d7bb0eb603c0b7385421bd5b553273424373867
David Brazdil [Tue, 13 Mar 2018 17:46:33 +0000 (17:46 +0000)]
Merge "Add PrintSpooler to system app whitelist"
am:
e6456d160c
Change-Id: I991aef25ccb7eb8c3975f5bb2b44f17e430b761a
Brad Ebinger [Tue, 13 Mar 2018 16:31:35 +0000 (16:31 +0000)]
Merge "Remove unneeded notify AIDL API"
Brad Ebinger [Tue, 13 Mar 2018 16:30:45 +0000 (16:30 +0000)]
Merge "Remove IMS Emergency Calling availability API"
David Brazdil [Tue, 13 Mar 2018 16:14:03 +0000 (16:14 +0000)]
Add PrintRecommendationService to hidden API package whitelist
This app builds directly against the platform. Add it to the whitelist.
Bug:
64382372
Test: make
Test: device boots
Change-Id: I16574374d2c233221cd1305f031f78aca1947f05
David Brazdil [Tue, 13 Mar 2018 16:07:40 +0000 (16:07 +0000)]
Merge "Add PrintSpooler to system app whitelist"
Andreas Gampe [Mon, 12 Mar 2018 21:53:34 +0000 (14:53 -0700)]
Frameworks: Refactor FileDescriptorTable errors
Surface error messages to the caller.
Bug:
74531335
Test: m
Test: Device boots
Change-Id: I14df050feb7f5417bb08d190492c3050cdbb1c1d