OSDN Git Service
Nazanin Bakhshi [Fri, 8 Mar 2019 18:45:20 +0000 (10:45 -0800)]
Merge "Rename PREFERRED_DATA_SUBID_CHANGE to ACTIVE_DATA_SUB_CHANGE"
am:
016409b3d5
Change-Id: I2ced5079661da96b12c3359b6dc89412b585993a
Nazanin Bakhshi [Fri, 8 Mar 2019 18:25:59 +0000 (18:25 +0000)]
Merge "Rename PREFERRED_DATA_SUBID_CHANGE to ACTIVE_DATA_SUB_CHANGE"
Max Bires [Fri, 8 Mar 2019 18:22:53 +0000 (10:22 -0800)]
Merge "Adding KEY_PERMANENTLY_INVALIDATED int"
am:
18e0781d3d
Change-Id: I9a31a0b3c9abc72a619c06c2ffc092d5ef557213
Tyler Gunn [Fri, 8 Mar 2019 18:17:24 +0000 (10:17 -0800)]
Merge "Add carrier config key for TTY support."
am:
16f6deae44
Change-Id: Icd9d8ee8be9a4dafcca5ae6808b167c49e2e9e9f
David Anderson [Fri, 8 Mar 2019 17:55:40 +0000 (09:55 -0800)]
Merge "Update DynamicAndroidService for IGsiService AIDL changes."
am:
1451b2f3a5
Change-Id: I09b53ae751ffdff9e7fa31a8e5ee347bf42a347c
Max Bires [Fri, 8 Mar 2019 17:53:05 +0000 (17:53 +0000)]
Merge "Adding KEY_PERMANENTLY_INVALIDATED int"
Tyler Gunn [Fri, 8 Mar 2019 17:52:52 +0000 (17:52 +0000)]
Merge "Add carrier config key for TTY support."
David Anderson [Fri, 8 Mar 2019 17:39:44 +0000 (17:39 +0000)]
Merge "Update DynamicAndroidService for IGsiService AIDL changes."
Andrei-Valentin Onea [Fri, 8 Mar 2019 16:43:07 +0000 (08:43 -0800)]
Merge "Add extra hidden api related tags"
am:
cfd72b9386
Change-Id: I547a0596de397469e02d88a524610c546c59f5f7
Chalard Jean [Fri, 8 Mar 2019 16:38:35 +0000 (08:38 -0800)]
Merge "Give Telephony the permissions to access the network stack."
am:
a6f3476476
Change-Id: I4ae09aac25226904e34d77edb7333da0aabe86f9
Andrei-Valentin Onea [Fri, 8 Mar 2019 16:22:11 +0000 (16:22 +0000)]
Merge "Add extra hidden api related tags"
Treehugger Robot [Fri, 8 Mar 2019 15:55:53 +0000 (15:55 +0000)]
Merge "Give Telephony the permissions to access the network stack."
Bernie Innocenti [Fri, 8 Mar 2019 15:50:29 +0000 (07:50 -0800)]
Merge "Add junyulai@ as owner of the core networking dirs"
am:
e5e3ac639b
Change-Id: I06cca33e638baf671b891eb0c20b4c8f439eda2e
Jimmy Chen [Fri, 8 Mar 2019 15:38:41 +0000 (07:38 -0800)]
Merge "IPv6: enable IPv6 link local routing for local network"
am:
f635f12666
Change-Id: I3f5ecbd047d9205c9430610c7d6fa9400ab587d4
Bernie Innocenti [Fri, 8 Mar 2019 15:21:01 +0000 (15:21 +0000)]
Merge "Add junyulai@ as owner of the core networking dirs"
Jimmy Chen [Fri, 8 Mar 2019 15:08:07 +0000 (15:08 +0000)]
Merge "IPv6: enable IPv6 link local routing for local network"
Ugo Yu [Fri, 8 Mar 2019 15:01:55 +0000 (07:01 -0800)]
Merge "Change BluetoothCodecStatus.sameCapabilities() to public"
am:
27a6501a19
Change-Id: Ib061fe25ba0ec460b601c893f0a1396626e00331
Chiachang Wang [Fri, 8 Mar 2019 14:57:24 +0000 (06:57 -0800)]
Merge "Not to use any() to verify DataStallDetectionStats"
am:
18e931ba12
Change-Id: I7510070bc3f68386d9b222fc14342e08fc6e9b22
Luke Huang [Fri, 8 Mar 2019 14:51:48 +0000 (06:51 -0800)]
Merge "Minor changes to the async DNS query JAVA API"
am:
c8dfb72891
Change-Id: I96e9325c7dd5396f48b25919a104be55fb9b6346
Hall Liu [Fri, 8 Mar 2019 14:46:46 +0000 (06:46 -0800)]
Merge "Add more nullability annotations"
am:
3f2d69dc62
Change-Id: I9b815b25cd48a5e24506f3f50fc6370bac1af552
Chalard Jean [Fri, 8 Mar 2019 14:42:23 +0000 (06:42 -0800)]
Merge "Support VPN Proxy(1/2)"
am:
65087f4705
Change-Id: I51a716d1ee6b85bef347164061d1c12183612f50
cnx421 [Fri, 8 Mar 2019 14:38:44 +0000 (06:38 -0800)]
Merge "fix 'int android.view.View.getHeight()' on a null object reference"
am:
4add708b91
Change-Id: I3aa9c2da09a1447f79edb6a228f88cdc731bd605
Benedict Wong [Fri, 8 Mar 2019 14:35:04 +0000 (06:35 -0800)]
Merge changes Ie66ba631,Ic42c09a3
am:
cbc409986d
Change-Id: I5c8a3364f0244c5945be2bbe919aac2dcc4eba66
David Brazdil [Fri, 8 Mar 2019 14:29:15 +0000 (06:29 -0800)]
Merge "Move Camera.EventHandler constructor to greylist"
am:
b31032b3b0
Change-Id: If785b7e4f01db0a0e9b1e8d4e42258375de57dbc
Stanley Tng [Fri, 8 Mar 2019 14:25:47 +0000 (06:25 -0800)]
Merge "Add @NonNull annotations to Hearing Aids Profile APIs"
am:
6fa52c9b25
Change-Id: If06dc28087ad2fe14636e0147077b35af7947216
Xiangyu/Malcolm Chen [Fri, 8 Mar 2019 14:19:31 +0000 (06:19 -0800)]
Merge "Adding callback for setPreferredDataSubscriptionId."
am:
442084c722
Change-Id: Ic66db8504d02a22d8da38159e6d2fcf6decd1878
Brad Ebinger [Fri, 8 Mar 2019 14:16:02 +0000 (06:16 -0800)]
Merge "Fix NPE in SmsManager and keep existing behavior"
am:
8b95375a4a
Change-Id: I6b4d126b8b0a6a48bb91752dde2edd6af79b98b7
Brad Ebinger [Fri, 8 Mar 2019 14:12:38 +0000 (06:12 -0800)]
Merge "Add nullability annotations in accordance with the council"
am:
049c43f088
Change-Id: If13a487f14c6382aad010a3776dec76f7bf46738
Brad Ebinger [Fri, 8 Mar 2019 14:07:34 +0000 (06:07 -0800)]
Merge "Add CarrierConfig to use WFC home network mode in roaming network"
am:
98868a718a
Change-Id: Iabc46376d3b23d6462234c1eb9d1e9e389ac51dc
Ruchi Kandoi [Fri, 8 Mar 2019 14:03:45 +0000 (06:03 -0800)]
Merge "Add @NonNull annotations to (un)setOffHostForService()"
am:
78366e46b2
Change-Id: Ic96cc8e5d438d5083d5ad40e13367d7921f30af3
Andrei-Valentin Onea [Fri, 8 Mar 2019 14:00:20 +0000 (06:00 -0800)]
Merge "Add @UnsupportedAppUsage annotations"
am:
10c573ff85
Change-Id: I394e53a553e4c054c52fb3e991b4f81f3c152a94
Andrei-Valentin Onea [Fri, 8 Mar 2019 13:56:53 +0000 (05:56 -0800)]
Merge "Add @UnsupportedAppUsage annotations"
am:
5d256870aa
Change-Id: I2ff775d4b5f9417f8f68274b05829457fb00fe7a
Siarhei Vishniakou [Fri, 8 Mar 2019 13:53:28 +0000 (05:53 -0800)]
Merge "Add a null check for getWindow()"
am:
3c69948e6a
Change-Id: Ibeffcb78acdb9744993d3aec810acd27416ba455
Andrei Onea [Fri, 8 Mar 2019 12:34:28 +0000 (12:34 +0000)]
resolve merge conflicts of
04e04516b46a6e435282391f8cc4a7f50fe665b7 to stage-aosp-master
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Merged-In: If18cf25dbfb1b00d7bd39fd1e1032fd783fea792
Change-Id: I21e7d91ec2f6226c3f4b396eb00640021103006e
Bernie Innocenti [Fri, 8 Mar 2019 11:28:35 +0000 (20:28 +0900)]
Add junyulai@ as owner of the core networking dirs
Also removed emeritus accounts ek@ and silberst@ from various places.
A cleanup using 'include' would probably be in order...
Test: N/A
Change-Id: I575e60dd5e600e42d9571ce8e8d7661d30e99bfe
Chalard Jean [Fri, 8 Mar 2019 10:46:00 +0000 (19:46 +0900)]
Give Telephony the permissions to access the network stack.
Test: manual
Change-Id: I28308f421aa955fe110b50452b115a0178b24745
Treehugger Robot [Fri, 8 Mar 2019 10:38:47 +0000 (10:38 +0000)]
Merge "Change BluetoothCodecStatus.sameCapabilities() to public"
Treehugger Robot [Fri, 8 Mar 2019 09:26:05 +0000 (09:26 +0000)]
Merge "Not to use any() to verify DataStallDetectionStats"
Jimmy Chen [Thu, 7 Mar 2019 06:15:36 +0000 (14:15 +0800)]
IPv6: enable IPv6 link local routing for local network
IPv6 link local is an automatically configured address. The routing should be
activated regardless of the DHCP service.
Bug:
126063997
Test: Unit tests - atest FrameworksNetTests
Test: Unit tests - atest FrameworksWifiTests
Test: * DUT1 enables hotspot
* DUT2 associates to DUT1
* use ping6 to verify the local link on both side
Test: * DUT1 creates a P2P group
* DUT2 joins this group as a legacy client
* use ping6 to verify the local link on both side
Change-Id: I102bf29e8da14808097e43c840d74d41b6b3758f
Chiachang Wang [Fri, 8 Mar 2019 06:34:19 +0000 (14:34 +0800)]
Not to use any() to verify DataStallDetectionStats
Build a empty DataStallDetectionStats object instead of use
any() to do the verification to prevent NPE while trying to
write the metrics.
Bug:
120452078
Test: atest NetworkStackTests
Change-Id: Ib9f3e56195a539a5ca4826b4aad0e38945a9a3a7
Luke Huang [Fri, 8 Mar 2019 03:19:55 +0000 (03:19 +0000)]
Merge "Minor changes to the async DNS query JAVA API"
Treehugger Robot [Fri, 8 Mar 2019 03:16:43 +0000 (03:16 +0000)]
Merge "Add more nullability annotations"
Chalard Jean [Fri, 8 Mar 2019 00:34:25 +0000 (00:34 +0000)]
Merge "Support VPN Proxy(1/2)"
Treehugger Robot [Fri, 8 Mar 2019 00:19:39 +0000 (00:19 +0000)]
Merge "fix 'int android.view.View.getHeight()' on a null object reference"
Benedict Wong [Thu, 7 Mar 2019 23:32:55 +0000 (23:32 +0000)]
Merge changes Ie66ba631,Ic42c09a3
* changes:
Implement TestNetworkService
Add shell TestNetworkManager and Service
Treehugger Robot [Thu, 7 Mar 2019 23:16:40 +0000 (23:16 +0000)]
Merge "Move Camera.EventHandler constructor to greylist"
Treehugger Robot [Thu, 7 Mar 2019 22:59:06 +0000 (22:59 +0000)]
Merge "Add @NonNull annotations to Hearing Aids Profile APIs"
Xiangyu/Malcolm Chen [Thu, 7 Mar 2019 22:47:31 +0000 (22:47 +0000)]
Merge "Adding callback for setPreferredDataSubscriptionId."
Brad Ebinger [Thu, 7 Mar 2019 22:27:19 +0000 (22:27 +0000)]
Merge "Fix NPE in SmsManager and keep existing behavior"
Brad Ebinger [Thu, 7 Mar 2019 21:14:18 +0000 (21:14 +0000)]
Merge "Add nullability annotations in accordance with the council"
Brad Ebinger [Thu, 7 Mar 2019 21:11:51 +0000 (21:11 +0000)]
Merge "Add CarrierConfig to use WFC home network mode in roaming network"
Treehugger Robot [Thu, 7 Mar 2019 20:07:16 +0000 (20:07 +0000)]
Merge "Add @NonNull annotations to (un)setOffHostForService()"
Malcolm Chen [Fri, 15 Feb 2019 03:50:19 +0000 (19:50 -0800)]
Rename PREFERRED_DATA_SUBID_CHANGE to ACTIVE_DATA_SUB_CHANGE
Redefine a PhoneStateListener event so that it reflects which
subscription is currently being used for Internet data. It could
be default user data subscription or currently active opportunistic
subscription.
Bug:
124260187
Test: unittest
Change-Id: Icb90b5bd93845c29157cafddcd53335728638ec2
Merged-In: Icb90b5bd93845c29157cafddcd53335728638ec2
Android Build Merger (Role) [Thu, 7 Mar 2019 19:19:39 +0000 (19:19 +0000)]
Merge "Merge "Add @UnsupportedAppUsage annotations" am:
315404a9a5" into stage-aosp-master
Andrei-Valentin Onea [Thu, 7 Mar 2019 19:18:44 +0000 (11:18 -0800)]
Merge "Add @UnsupportedAppUsage annotations"
am:
315404a9a5
Change-Id: Ic6969243ca77124ff2063359c341969d01eeb7d9
Andrei-Valentin Onea [Thu, 7 Mar 2019 19:10:22 +0000 (11:10 -0800)]
Merge "Add @UnsupportedAppUsage annotations"
am:
315404a9a5
Change-Id: I281b0d628f1201e88d4c7c3a764f5a55392dadaa
David Brazdil [Thu, 7 Mar 2019 17:41:03 +0000 (17:41 +0000)]
Move Camera.EventHandler constructor to greylist
Exempted-From-Owner-Approval: Automatic changes to the codebase
affecting only @UnsupportedAppUsage annotations, themselves added
without requiring owners approval earlier.
Bug:
122331906
Test: m appcompat
Change-Id: I3abc8221706bd69668c90aa61b8ca5f137a88bb9
Andrei-Valentin Onea [Thu, 7 Mar 2019 17:26:15 +0000 (17:26 +0000)]
Merge "Add @UnsupportedAppUsage annotations"
Andrei-Valentin Onea [Thu, 7 Mar 2019 17:26:09 +0000 (17:26 +0000)]
Merge "Add @UnsupportedAppUsage annotations"
Treehugger Robot [Thu, 7 Mar 2019 17:02:00 +0000 (17:02 +0000)]
Merge "Add a null check for getWindow()"
Andrei-Valentin Onea [Thu, 7 Mar 2019 16:31:14 +0000 (16:31 +0000)]
Merge "Add target for generating aidl mappings"
Andrei-Valentin Onea [Thu, 7 Mar 2019 16:30:32 +0000 (16:30 +0000)]
Merge "Add @UnsupportedAppUsage annotations"
Leo Hsu [Thu, 7 Mar 2019 13:56:52 +0000 (05:56 -0800)]
Merge "Exclude Emergency Dialer from recent app list."
am:
108b8d6e40
Change-Id: I2c91bdea23f77be5e0e7e09d6b7c888bc1755e46
Treehugger Robot [Thu, 7 Mar 2019 13:43:36 +0000 (13:43 +0000)]
Merge "Exclude Emergency Dialer from recent app list."
Mark Chien [Thu, 7 Mar 2019 13:32:33 +0000 (05:32 -0800)]
Merge "Fix TetheringEntitlementValueListener related API"
am:
fbcc63d51f
Change-Id: Idd3a7110c32319b610d5dacad7e3632d759ac887
Mark Chien [Thu, 7 Mar 2019 13:21:53 +0000 (13:21 +0000)]
Merge "Fix TetheringEntitlementValueListener related API"
Leo Hsu [Wed, 6 Mar 2019 07:25:28 +0000 (15:25 +0800)]
Exclude Emergency Dialer from recent app list.
Emergency Dialer should not show up in recent app list.
Bug:
112168722
Bug:
127585929
Test: Long press power key, tap Emergency, quit Emergency Dialer, and
check recent app list.
Change-Id: I2fe917d16ab23de6e82f9cad7b064e2837ec6490
Merged-In: I2fe917d16ab23de6e82f9cad7b064e2837ec6490
Andrei Onea [Fri, 1 Mar 2019 18:49:15 +0000 (18:49 +0000)]
Add extra hidden api related tags
@SystemApi and @TestApi entries in the whitelist can now be
differentiated from the rest of the apis. @TestApi methods
are implicitly greylisted.
Test: m test-art-host-gtest-hiddenapi_test
Change-Id: Id739f04550842f7b3160685e1635ba20efb223cc
Andrei-Valentin Onea [Thu, 7 Mar 2019 10:32:26 +0000 (02:32 -0800)]
Merge "Add @UnsupportedAppUsage annotations"
am:
722dff1f35
Change-Id: I559e8abb355a41119d9cd86a497fbdbd69157f9b
Andrei-Valentin Onea [Thu, 7 Mar 2019 10:20:28 +0000 (10:20 +0000)]
Merge "Add @UnsupportedAppUsage annotations"
Chad Brubaker [Thu, 7 Mar 2019 09:10:53 +0000 (01:10 -0800)]
Merge "Do not call noteOp if checkPermission fails"
am:
bc9b1b6f94
Change-Id: I53347c7a897b079268d9c8af704664a832eae581
Treehugger Robot [Thu, 7 Mar 2019 08:56:39 +0000 (08:56 +0000)]
Merge "Do not call noteOp if checkPermission fails"
Luke Huang [Wed, 23 Jan 2019 13:53:13 +0000 (21:53 +0800)]
Minor changes to the async DNS query JAVA API
1. refine the naming in DnsPacket and add more comment
2. add comment in DnsResolver
Test: built, flashed, booted
atest DnsResolverTest DnsPacketTest
Change-Id: Ib482d079d6823fd1d9bff163427b7aad38374199
Brett Chabot [Thu, 7 Mar 2019 05:51:50 +0000 (21:51 -0800)]
Merge "Migrate frameworks/base/tests/net/ to androidx.test"
am:
58038da960
Change-Id: Ic6783d55ba6e6a4009569952b542b2a5a42501fe
Treehugger Robot [Thu, 7 Mar 2019 05:42:07 +0000 (05:42 +0000)]
Merge "Migrate frameworks/base/tests/net/ to androidx.test"
markchien [Wed, 6 Mar 2019 08:25:00 +0000 (16:25 +0800)]
Fix TetheringEntitlementValueListener related API
Test: -build, flash, boot
-atest FrameworksNetTests
bug:
126701557
bug:
126392011
Change-Id: I6dda10fbfe8ffaef71269617750a22563396f5ea
Remi NGUYEN VAN [Thu, 7 Mar 2019 04:13:28 +0000 (20:13 -0800)]
Merge "Fix SocketUtils API"
am:
3da7809ae4
Change-Id: I03e0eb60d71cba27e57f8ee7832269bbd75f5344
Remi NGUYEN VAN [Thu, 7 Mar 2019 03:54:22 +0000 (03:54 +0000)]
Merge "Fix SocketUtils API"
Josh Hou [Thu, 7 Mar 2019 01:32:50 +0000 (17:32 -0800)]
Merge "add NonNull annotation to API"
am:
fd2bb72030
Change-Id: Idf5a7df74815a9e339cf4313506f269ddbdce5d1
Treehugger Robot [Thu, 7 Mar 2019 01:07:34 +0000 (01:07 +0000)]
Merge "add NonNull annotation to API"
Hall Liu [Thu, 7 Mar 2019 00:33:02 +0000 (16:33 -0800)]
Merge "API tweaks"
am:
f3fbbeaa05
Change-Id: I3d45d13a482125edd91ec86e5c297f9fdb976072
Hall Liu [Thu, 7 Mar 2019 00:11:31 +0000 (00:11 +0000)]
Merge "API tweaks"
Jordan Liu [Wed, 6 Mar 2019 23:44:19 +0000 (15:44 -0800)]
Merge "Reset callNetworkType and CallQuality after calls"
am:
5819a3378d
Change-Id: Ie7a8141b002693946967eb4b0d70fae299be03bc
Benedict Wong [Thu, 15 Nov 2018 01:53:19 +0000 (17:53 -0800)]
Implement TestNetworkService
This change adds the relevant JNI implementations, as well as the
implementations and NetworkAgent tracking code in the TestNetworkService.
TestNetworkService (And Manager) is designed for use exclusively in
testing code, allowing for the creation of TUN and IPsec backed networks
in test code. Specifically, this allows for testing of components such
as IP, DHCP, or DNS clients, as well as kernel features such as IPsec.
Access to the TestNetworkService will be conditioned upon the
MANAGE_TEST_NETWORKS permission that will be granted only to the Shell.
CTS will use UiAutomation.adoptShellPermissionIdentity() to gain the
ability to use this service.
Bug:
72950854
Test: CTS tests passing
Change-Id: Ie66ba631a548b5f9c6b5ed0797582f86688debe5
Hiroto Tarui [Thu, 14 Feb 2019 05:37:09 +0000 (14:37 +0900)]
Add CarrierConfig to use WFC home network mode in roaming network
Add a config whether the carrier will use the WFC home network mode in
roaming netork.
Test: manual - Checked that use the WFC mode according to CarrierConfig
value.
Bug:
79666081
Merged-In: I19fd3818c97db2565e13c5272c5307deef1331d1
Change-Id: I19fd3818c97db2565e13c5272c5307deef1331d1
Brad Ebinger [Wed, 6 Mar 2019 22:32:28 +0000 (14:32 -0800)]
Fix NPE in SmsManager and keep existing behavior
The behavior of SmsManager#sendTextMessage changed,
we are blocking the sending of the SMS if there were no
subscriptions (i.e. no SIM scenario). This change
accidently introduced a NPE scenario in some cases.
Fixed NPE and removed SMS blocking code in SmsManager
to keep existing functionality the same.
Bug:
127338050
Test: atest GtsTelephonyTestCases
Change-Id: I71eefbc8e1619701e1b1d7b12c3c080c4ef376ef
Treehugger Robot [Wed, 6 Mar 2019 23:28:33 +0000 (23:28 +0000)]
Merge "Reset callNetworkType and CallQuality after calls"
Brad Ebinger [Wed, 6 Mar 2019 23:04:11 +0000 (15:04 -0800)]
Merge "Add Nullable/NonNull Annotations where appropriate."
am:
eb4d20673f
Change-Id: Idc4e4d59c4773832111ff4383b1aa494d539f2d9
Malcolm Chen [Wed, 6 Feb 2019 01:19:48 +0000 (17:19 -0800)]
Adding callback for setPreferredDataSubscriptionId.
The purpose is to provide a way to return success or failure upon
switching data to CBRS subscription.
The same callback is used for ONS to call internal API. Later it
will also be used by Carrier apps to call TelephonyManager#
setPreferredOpportunisticDataSubscription.
Bug:
122255288
Test: manual
Change-Id: Id3f43e024c902d6785017e7866f9e804a486b04f
Merged-In: Id3f43e024c902d6785017e7866f9e804a486b04f
Brad Ebinger [Wed, 6 Mar 2019 22:47:58 +0000 (22:47 +0000)]
Merge "Add Nullable/NonNull Annotations where appropriate."
Pengquan Meng [Wed, 6 Mar 2019 22:32:03 +0000 (14:32 -0800)]
Merge "[API Feedback] Rename getChannelNumber to getNrarfcn"
am:
8273d66ebc
Change-Id: I5da974b3b914c2581e8b315016ee2c2ff53ad45d
David Anderson [Wed, 27 Feb 2019 21:45:34 +0000 (13:45 -0800)]
Update DynamicAndroidService for IGsiService AIDL changes.
Bug:
125540538
Test: framework builds
Change-Id: I7c7f5053d02b231c4d987a145034683ff325e276
Nathan Harold [Wed, 6 Mar 2019 21:54:50 +0000 (13:54 -0800)]
Merge "Move Annotations for getCellSignalStrengths"
am:
5ba92cf940
Change-Id: I6b91cdd94c5367ec4f89b7959d746faae10df1ef
Pengquan Meng [Wed, 6 Mar 2019 21:52:32 +0000 (21:52 +0000)]
Merge "[API Feedback] Rename getChannelNumber to getNrarfcn"
Pengquan Meng [Wed, 6 Mar 2019 21:46:02 +0000 (13:46 -0800)]
Merge "Add carrier config for 5G Icon"
am:
2aee6901fb
Change-Id: Iec2c01555d1200f707ee41f23d7ef75799d678f7
Chad Brubaker [Wed, 6 Mar 2019 00:40:33 +0000 (16:40 -0800)]
Do not call noteOp if checkPermission fails
This causes an access to be logged for runtime permissions even if the
permission is denied, which is incorrect.
Fixes:
127297477
Bug:
116258458
Test: Verified using steps in b/
127297477
Change-Id: I8306aa273b7d4dfab40a2a6d8d1ef6f4d8cc2c54
Nathan Harold [Wed, 6 Mar 2019 21:41:18 +0000 (21:41 +0000)]
Merge "Move Annotations for getCellSignalStrengths"
Pengquan Meng [Wed, 6 Mar 2019 21:36:46 +0000 (21:36 +0000)]
Merge "Add carrier config for 5G Icon"
Felipe Leme [Wed, 6 Mar 2019 21:00:38 +0000 (13:00 -0800)]
Merge "Added secondary owners on per-file entries."
am:
6d80c7a6e4
Change-Id: I64bd54a36864d957e30c2920698dea03717c6a0d
Brad Ebinger [Wed, 6 Mar 2019 19:32:42 +0000 (11:32 -0800)]
Add nullability annotations in accordance with the council
Bug:
126702532
Test: atest FrameworksTelephonyTests
Change-Id: I7c3707d7599ec0e2a1d1ec2e70588765aea5d069
OSDN Git Service
