OSDN Git Service
Florian Mayer [Tue, 16 Oct 2018 13:30:02 +0000 (14:30 +0100)]
Allow zygote to keep socket to heapprofd.
This allows users to target zygote for heap profiling without
causing it to crash on ForkCommon.
This also allows us to profile zygote in benchmark runs where we want to
profile as many processes as possible.
Bug:
117821125
Test: m
Test: flashed walleye
Change-Id: I3f41b64e0a64e362eafd02cd4e86cb77e434d94c
Junyu Lai [Wed, 31 Oct 2018 02:20:57 +0000 (02:20 +0000)]
Merge "Fix negative uid stats caused by 464xlat adjust when eBPF is on."
Youming Ye [Wed, 31 Oct 2018 00:44:04 +0000 (00:44 +0000)]
Merge "Add CarrierConfig to hide "Network default" option in Caller ID setting"
Treehugger Robot [Tue, 30 Oct 2018 19:06:55 +0000 (19:06 +0000)]
Merge "Change package to component for Setting's default call redirection service"
Treehugger Robot [Tue, 30 Oct 2018 17:53:24 +0000 (17:53 +0000)]
Merge "Define CellInfo.UNAVAILABLE for Unreported Fields"
junyulai [Fri, 19 Oct 2018 13:14:30 +0000 (21:14 +0800)]
Fix negative uid stats caused by 464xlat adjust when eBPF is on.
When using xt_qtaguid to count per uid stats,
NetworkStatsService needs to adjust the 464xlat traffic since
iptables module would double count for ipv4 and ipv6 packet.
But for eBPF, the per uid stats is collected in a different
hook, so the adjustment on root uid would only be needed in tx
direction.
Bug:
112226716
Test: 1. Make ipv4 traffic in ipv6-only network and check data
usage.
2. Make ipv4 traffic in a client which connect to
ipv6-only hotspot.
3. runtest frameworks-net
4. cts-tradefed run cts -m CtsNetTestCases -t \
android.net.cts.TrafficStatsTest
5. cts-tradefed run cts -m CtsUsageStatsTestCases
Change-Id: Ic9a84f5446eddc943c255d5f3b89dad171f53cac
vichang [Tue, 30 Oct 2018 12:04:05 +0000 (12:04 +0000)]
Merge changes from topic "icu63"
* changes:
API updated for ICU4J 63.1
Fix FormatterTest#testFormatShortElapsedTime due to CLDR 34 change
Treehugger Robot [Tue, 30 Oct 2018 04:44:35 +0000 (04:44 +0000)]
Merge "Add CACHED_NAME into call history database when the add call."
sqian [Tue, 30 Oct 2018 01:35:42 +0000 (18:35 -0700)]
Change package to component for Setting's default call redirection service
Bug:
64959558
Test: Compile
Change-Id: I503b34812869e2b5897033ca765c85fcd4474101
Tony Zhu [Tue, 30 Oct 2018 02:43:52 +0000 (02:43 +0000)]
Merge "[Call Screening]Default call screening app setting storage."
Philip P. Moltmann [Mon, 29 Oct 2018 23:15:47 +0000 (23:15 +0000)]
Merge "Synchronize mPermissions to void NullPointerException."
Ian Kasprzak [Mon, 29 Oct 2018 22:57:06 +0000 (22:57 +0000)]
Merge "Add new test module for system service with static / final mocking"
Makoto Onuki [Wed, 5 Sep 2018 20:45:40 +0000 (13:45 -0700)]
Add new test module for system service with static / final mocking
And move AppStateTrackerTest for starter.
Bug:
114096820
Bug:
118510622
Test: atest FrameworksMockingServicesTests
Change-Id: Ie5bf44322f29e9971358a706cf44bc5c8a325c30
Merged-In: Ie5bf44322f29e9971358a706cf44bc5c8a325c30
(cherry picked from commit
5f732365c6a33c2115bfd159b8b9729b834c8568)
Treehugger Robot [Mon, 29 Oct 2018 19:48:34 +0000 (19:48 +0000)]
Merge "Import translations. DO NOT MERGE"
Treehugger Robot [Mon, 29 Oct 2018 19:17:14 +0000 (19:17 +0000)]
Merge "Adjust to new androidx.test beta02 rules."
Chen Xu [Mon, 29 Oct 2018 17:20:48 +0000 (17:20 +0000)]
Merge "Revert "Revert "Telephony light grey list clean up for Q"""
Gopinath Elanchezhian [Mon, 29 Oct 2018 17:14:46 +0000 (17:14 +0000)]
Merge "Add statsdprotolite in Android.bp"
Treehugger Robot [Mon, 29 Oct 2018 00:17:34 +0000 (00:17 +0000)]
Merge "Refactor UidRange by using stable aidl structure"
Luke Huang [Mon, 29 Oct 2018 00:16:30 +0000 (00:16 +0000)]
Merge "Refine firewall-related commands"
Bill Yi [Sun, 28 Oct 2018 04:44:04 +0000 (21:44 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie1dfa01427b8ab87208789b65055be3175f8a7e3
Auto-generated-cl: translation import
Treehugger Robot [Sat, 27 Oct 2018 03:51:31 +0000 (03:51 +0000)]
Merge "allow statsd pull based on event trigger."
Chen Xu [Mon, 22 Oct 2018 16:54:39 +0000 (16:54 +0000)]
Revert "Revert "Telephony light grey list clean up for Q""
This reverts commit
bab59cb9db0fe98550d12f03e210e3bc0efc775d.
Reason for revert: Put maxTargetSdk=P now will move APIs onto light greylist
because per-SDK versioned dark greylist is not yet supported by ART. We can
keep doing annotation work without breaking existing apps targeting on P.
Bug:
117934933
Bug:
112477300
Change-Id: I5e0e693dde49fac3044cd73fd6360c4485f312ec
Merged-in: I5e0e693dde49fac3044cd73fd6360c4485f312ec
gopinath [Fri, 26 Oct 2018 23:00:34 +0000 (16:00 -0700)]
Add statsdprotolite in Android.bp
Bug: b/
118482428
Test: make statsdprotolite
Change-Id: I5c27f3017be043b6809699158a94b32155163535
Merged-In: I857957e816506162496192fe0ad1da4dbdfd4efd
gopinath [Fri, 26 Oct 2018 22:20:18 +0000 (15:20 -0700)]
allow statsd pull based on event trigger.
Bug: b/
118482428
Test: make statsdprotolite
Change-Id: I5a40d5e6a409b65ca1639029d5da83c327ed1798
Merged-In: Ia15b1f209945f022edffb9ec5d673317d55d9e4f
tonyzhu [Thu, 25 Oct 2018 08:13:14 +0000 (16:13 +0800)]
[Call Screening]Default call screening app setting storage.
Add new string in Settings. To indicate which app is default
call screening, similar to default dialer application setting,
store this in the system settings provider.
Bug:
118416082
Test: atest SettingsBackupTest pass.
Change-Id: I39f81b31a68ee2dbb056ff935f8dea0f51720017
Chalard Jean [Fri, 26 Oct 2018 06:06:19 +0000 (06:06 +0000)]
Merge "ConnectivityService: make log configurable"
Junyu Lai [Fri, 26 Oct 2018 05:35:28 +0000 (05:35 +0000)]
Merge "No-op refactoring of VPN lockdown status check."
Treehugger Robot [Fri, 26 Oct 2018 05:19:41 +0000 (05:19 +0000)]
Merge "Update test cases for HarfBuzz 2.0.2"
Hall Liu [Fri, 26 Oct 2018 01:35:24 +0000 (01:35 +0000)]
Merge "Move Binder.clearCallingIdentity"
Xiangyu/Malcolm Chen [Fri, 26 Oct 2018 01:30:21 +0000 (01:30 +0000)]
Merge "Add @NonNull in SubMgr#getOpportunisticSubscriptions return value."
Nathan Harold [Wed, 24 Oct 2018 18:35:53 +0000 (11:35 -0700)]
Define CellInfo.UNAVAILABLE for Unreported Fields
For all CellInfo classes, there is a common value for
fields that are unreported by the modem: Integer.MAX_VALUE.
To better document this value, this CL defines it as a
constant "UNAVAILABLE" to indicate that for whatever reason
the framework is not reporting this value to the caller.
Bug:
28171234
Test: make; make offline-sdk-docs
Change-Id: I0aa692e3f1b5478284d262ef97fd65b90bce8293
Seigo Nonaka [Thu, 25 Oct 2018 21:55:12 +0000 (21:55 +0000)]
Update test cases for HarfBuzz 2.0.2
Now HarfBuzz combines chars with ZWJ into single cluster
This is 2nd attempt of Ic642c469aab90a2ecd3874cf0dec82625ea21c1b
Bug:
117953171
Test: TreeHugger
Change-Id: I7e731500e71c1973c254ede0f316fc36e3c22576
Merged-In: I531b7a5f5727540d6d11db619eeba6eb23fb113d
Pengquan Meng [Thu, 25 Oct 2018 20:47:41 +0000 (20:47 +0000)]
Merge "Set default value to false for show4GForLte"
Seigo Nonaka [Thu, 25 Oct 2018 18:26:33 +0000 (18:26 +0000)]
Merge "Revert "Update test cases for HarfBuzz 2.0.2 DO NOT MERGE""
Seigo Nonaka [Thu, 25 Oct 2018 18:23:32 +0000 (18:23 +0000)]
Revert "Update test cases for HarfBuzz 2.0.2 DO NOT MERGE"
This reverts commit
155951f2f6080d87e6cca6698e63ecb58641442d.
Reason for revert: broke test in pi-dev/stage-aosp-master
Change-Id: I917e170b570b89ba2e8a26cec0bf0a8adf577b80
Brett Chabot [Thu, 18 Oct 2018 17:49:53 +0000 (10:49 -0700)]
Adjust to new androidx.test beta02 rules.
Test: m -j checkbuild
Change-Id: I704324a8880c5948369ae4fa6814fd8b258d7d33
Merged-In: I6482ff8afbae39ffd0296aeac7b29ba019daf3a6
Treehugger Robot [Thu, 25 Oct 2018 16:42:11 +0000 (16:42 +0000)]
Merge "Update test cases for HarfBuzz 2.0.2 DO NOT MERGE"
Treehugger Robot [Thu, 25 Oct 2018 10:36:36 +0000 (10:36 +0000)]
Merge "Import translations. DO NOT MERGE"
Junyu Lai [Thu, 25 Oct 2018 08:57:56 +0000 (08:57 +0000)]
Merge "Add more debug log when onBlockedStatusChanged was called."
junyulai [Thu, 25 Oct 2018 02:56:17 +0000 (10:56 +0800)]
No-op refactoring of VPN lockdown status check.
Currently, if VPN lockdown is disabled, the blocking judgement
inside VPN will return false immediately. It will make
ConnectivityService hard to check blocked status by a given
VPN lockdown status.
Thus, move this check into ConnectivityService and check it
externally.
Bug:
117814902
Test: 1. manual test with 3rd-party vpn app
2. runtest frameworks-net
Change-Id: Ia8319b1a1a12f1058c24badf2431f2ec69bc78e7
junyulai [Wed, 24 Oct 2018 14:38:06 +0000 (22:38 +0800)]
Add more debug log when onBlockedStatusChanged was called.
Bug:
118355916
Test: 1. runtest frameworks-net
2. enable/disable battery saver
Change-Id: I6d5f9b49be0defd531fc7ea824668bec7863c4b7
Bill Yi [Thu, 25 Oct 2018 06:18:42 +0000 (23:18 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie2e07cbd6d038a83b2f05b315b647a35872f6daf
Auto-generated-cl: translation import
Luke Huang [Thu, 25 Oct 2018 02:54:05 +0000 (11:54 +0900)]
Refine firewall-related commands
Test: runtest frameworks-net passes
Test: manual testing of firewall works
Change-Id: I272bb54ffcde72d04cbcf550e31dafeeb00f1ce2
Chong Zhang [Thu, 25 Oct 2018 02:04:48 +0000 (02:04 +0000)]
Merge "Add keys to retrieve color aspects from metadata"
Chong Zhang [Thu, 25 Oct 2018 02:04:48 +0000 (02:04 +0000)]
Merge "Color aspects keys information stored database"
Xiangyu/Malcolm Chen [Thu, 25 Oct 2018 01:37:34 +0000 (01:37 +0000)]
Merge "Define RIL_REQUEST_SET_PREFERRED_DATA_MODEM."
Luke Huang [Thu, 25 Oct 2018 00:20:12 +0000 (00:20 +0000)]
Merge "Firewall-related commands porting"
Pengquan Meng [Wed, 24 Oct 2018 22:43:44 +0000 (15:43 -0700)]
Set default value to false for show4GForLte
Bug:
118375031
Test: build
Change-Id: I542bfcbf5e88748321f75bdf3bdd5faa214360ea
Malcolm Chen [Mon, 8 Oct 2018 21:18:30 +0000 (14:18 -0700)]
Define RIL_REQUEST_SET_PREFERRED_DATA_MODEM.
Bug:
80268699
Test: unittest
Change-Id: Ifda606784f97c1bfa03fb424fd488bb0b5e6ebec
Merged-In: Ifda606784f97c1bfa03fb424fd488bb0b5e6ebec
Youming Ye [Wed, 24 Oct 2018 21:54:39 +0000 (14:54 -0700)]
Add CarrierConfig to hide "Network default" option in Caller ID setting
Add a key to hide "Network default". When value is false,
"Network default" shouldn't be displayed for options in Caller ID
setting.
Test: manual - check options in Caller ID setting
Bug:
111809829
Change-Id: Ic9bab7e819bc5b0164508f9d2709a35950fdc797
Bill Yi [Wed, 24 Oct 2018 21:48:44 +0000 (14:48 -0700)]
Merge pie-platform-release to aosp-master - DO NOT MERGE
Change-Id: I695db52f5e22509401258e8b083e7650d401d993
Brad Ebinger [Wed, 24 Oct 2018 20:15:35 +0000 (20:15 +0000)]
Merge "Remove obsolete @VisibleForTesting Annotation"
Brad Ebinger [Wed, 24 Oct 2018 17:08:39 +0000 (17:08 +0000)]
Merge "ImsSsData needs a public constructor for vendors to use"
Youming Ye [Wed, 24 Oct 2018 16:26:21 +0000 (16:26 +0000)]
Merge "Revert "Add CarrierConfig to hide "Network default" option in Caller ID setting""
Tony Zhu [Wed, 24 Oct 2018 15:51:48 +0000 (15:51 +0000)]
Merge "[Call Screening]Support for carrier call screening app"
Luke Huang [Fri, 19 Oct 2018 06:57:05 +0000 (15:57 +0900)]
Refactor UidRange by using stable aidl structure
Use stable aidl generated structure instead of UidRange
Test: runtest frameworks-net passes
Test: manual testing of UidRange related function works
Change-Id: Iaf1c10777dc1e71df2be2a57533a10257b12626b
Chalard Jean [Wed, 24 Oct 2018 07:15:20 +0000 (07:15 +0000)]
Merge "To support skip464xlat per Network"
xiaobing.sun [Fri, 12 Oct 2018 09:04:29 +0000 (17:04 +0800)]
Synchronize mPermissions to void NullPointerException.
When we run mokey test on App permissions activity of a APK for example Contacts(Settings -> Apps & notifications ->See all ** apps -> Contacts ->Permissions),if we grant and revoke some permission frequently,NullPointerException may happen.
As granting runtime perimssion leads to writting new state of runtime permissions on disk via BackgroundThread. To write new state of runtime permissions, system will get the permissionData stored in mPermissions(assume that this permissionData is stored at the last location ).If we revoke this permison,permissionData will be removed from mPermissions on another thread. So in function getPermissionStatesInternal,mPermissions.valueAt(i) may return null by chance so that crash will happen. So we should synchronize mPermissions to void NullPointerException.
Bug:
115697209
Test: Make services.jar,push it into phone and reboot.Run monkey test on App permissions activity and no NullPointerException happens.
Change-Id: I61151fa7df7a2c3830cff2eac9cc8284bd28c448
Seigo Nonaka [Wed, 24 Oct 2018 00:39:53 +0000 (17:39 -0700)]
Update test cases for HarfBuzz 2.0.2 DO NOT MERGE
Now HarfBuzz combines chars with ZWJ into single cluster
Bug:
117953171
Test: TreeHugger
Change-Id: Ic642c469aab90a2ecd3874cf0dec82625ea21c1b
Merged-In: I531b7a5f5727540d6d11db619eeba6eb23fb113d
Luke Huang [Tue, 31 Jul 2018 12:15:24 +0000 (20:15 +0800)]
Firewall-related commands porting
Test: runtest frameworks-net passes
Test: manual testing of firewall works
Change-Id: Ic19c3872988a2b5dd315feb57e0757797d00a6ac
Treehugger Robot [Wed, 24 Oct 2018 03:15:41 +0000 (03:15 +0000)]
Merge "Refine network-related commands porting"
Chiachang Wang [Wed, 24 Oct 2018 03:02:58 +0000 (03:02 +0000)]
Merge "Move captive portal detection to another thread"
Hall Liu [Wed, 24 Oct 2018 00:00:22 +0000 (00:00 +0000)]
Merge "Add test API to override carrier config"
Toshikazu Saito [Wed, 29 Aug 2018 06:00:22 +0000 (15:00 +0900)]
Add keys to retrieve color aspects from metadata
Add keys to retrieve color standard, color transfer and color range from
MediaMetadataRetriever.
Bug:
114329709
Test: put hdr/non-hdr contents and check media db
Change-Id: Ifa90f12a572b330f87acd6ef06e1e83ddceb8483
Nathan Harold [Tue, 23 Oct 2018 23:34:26 +0000 (23:34 +0000)]
Merge "Add getMobileNetworkOperator to CellIdentityTdscdma"
Brad Ebinger [Tue, 23 Oct 2018 22:46:59 +0000 (15:46 -0700)]
Remove obsolete @VisibleForTesting Annotation
Bug:
118296374
Test: atest FrameworksTelephonyTests
Change-Id: I5156db7d199f89307ca7c602bfc855dbc6ae236e
Treehugger Robot [Tue, 23 Oct 2018 22:18:55 +0000 (22:18 +0000)]
Merge "Fix for android.hardware.radio.Utils.createIntSet"
nobuhiko saitou [Mon, 3 Sep 2018 08:26:54 +0000 (17:26 +0900)]
Color aspects keys information stored database
Add keys for color aspects to VideoColumns in MediaStore.
And standard, transfer and range is stored to database.
Bug:
114329709
Test: put hdr/non-hdr contents and check media db
Change-Id: Id4bf27a35720f5cf5a60f08eb3f30314e1a1a167
Nathan Harold [Tue, 23 Oct 2018 22:02:15 +0000 (22:02 +0000)]
Merge "Remove Hidden TimestampType From CellInfo"
Brad Ebinger [Thu, 11 Oct 2018 23:21:22 +0000 (16:21 -0700)]
ImsSsData needs a public constructor for vendors to use
Expose Builder for IMS Supp Service APIs as well as clean
up some of the ambiguous int[] usage.
Bug:
117555643
Test: Manual
Change-Id: I5cad08e0a032f4e38a62ac033c01111319cf9fd5
Nathan Harold [Tue, 23 Oct 2018 21:53:51 +0000 (21:53 +0000)]
Merge "Move some members to the "Q blacklist"."
Tyler Gunn [Tue, 23 Oct 2018 20:49:43 +0000 (20:49 +0000)]
Merge "Re-add removed APIs per API council feedback."
Jan Kowal [Thu, 27 Sep 2018 07:54:39 +0000 (09:54 +0200)]
Fix for android.hardware.radio.Utils.createIntSet
Previous solution was assymetric: writeInt vs readTypedObject.
Also, specify the initial capacity to avoid unnecessary reallocations.
Bug:
117113131
Test: atest BroadcastRadioTests
Change-Id: Ib33b97d482422b1acac8e9420a0c974bcd59355b
Hall Liu [Tue, 23 Oct 2018 01:17:44 +0000 (18:17 -0700)]
Add test API to override carrier config
Add API surface and AIDL to enable override functionality for CTS
Change-Id: I55328a75f16fe91280530dd348d4a034694be6e9
Fixes:
118184943
Test: manually call api through shell cmd
Treehugger Robot [Tue, 23 Oct 2018 17:36:33 +0000 (17:36 +0000)]
Merge "Fix data source for HEIF exif extractor"
Treehugger Robot [Tue, 23 Oct 2018 17:36:33 +0000 (17:36 +0000)]
Merge "Change caught exception in MediaScanner when ExifInterface is created"
Xiangyu/Malcolm Chen [Tue, 23 Oct 2018 17:03:22 +0000 (17:03 +0000)]
Merge "Add PhoneStateListener#onPreferredDataSubIdChanged"
Brad Ebinger [Tue, 23 Oct 2018 16:50:04 +0000 (16:50 +0000)]
Merge "Adds new Public ImsManager API"
Chiachang Wang [Tue, 23 Oct 2018 13:10:57 +0000 (21:10 +0800)]
Move captive portal detection to another thread
isCaptivePortal() could take up to a minute. Resolving the
server's IP addresses could hit the DNS timeout, and attempting
connections to each of the server's several IP addresses
(currently one IPv4 and IPv6) could each take SOCKET_TIMEOUT_MS.
During this time this StateMachine will be unresponsive. Thus,
move detection to another thread.
Test: - runtest frameworks-net
- run cts -m CtsNetTestCases
-t android.net.cts.ConnectivityManagerTest
- manual test(VALIDATION_SUCCESS, VALIDATION_FAILED,
NETWORK_CAPTIVE_PORTAL_FOUND, bad network reported)
Bug:
113916551
Change-Id: I5ac39dc826acd26c64adaaa0b27a76cd7c7fd843
Victor Chang [Mon, 22 Oct 2018 08:56:20 +0000 (09:56 +0100)]
API updated for ICU4J 63.1
- Expose API that are set to @stable in ICU 63
- All methods have test coverage by CTS, according to the coverage
report http://go/libcore-coverage-qt
The new APIs are introduced with the following purpose:
1. New constant in UCharacter to obtain Unicode property of a unicode
character.
3 new classes: VerticalOrientation, IndicPositionalCategory, IndicSyllabicCategory
2. Some toString and hashCode are "undeprecated". They are methods in
Object, and shouldn't be "deprecated".
3. Obtain DecimalFormatSymbols in a particular numbering system
4. ICU currency becomes more friendly with java.util.Currency. Add
methods to convert between 2 types
5. BreakIterator supports input text in CharSequence
6. More powerful API in Edits and CaseMap
Bug:
109837373
Bug:
113100098
Test: CtsIcuTestCases
Change-Id: I8201f2ef6013b0326a4f37a01dec97dfa39f1c30
weichinweng [Wed, 17 Oct 2018 07:57:55 +0000 (15:57 +0800)]
Add CACHED_NAME into call history database when the add call.
* For some carkit will get the call history name to show its screen, But
the caller name is not into call history database.
* Add caller name into call history database for the carkit get correct
caller name.
Bug:
111968310
Bug:
117627934
Test: build pass, verify pass, Check call history after received different
type call (save number, not save number, private number)
Change-Id: Ic28320c0184e33aa934a9c9c82a6062f5ef44e2a
Nathan Harold [Sat, 6 Oct 2018 01:59:18 +0000 (18:59 -0700)]
Remove Hidden TimestampType From CellInfo
The timestamp type in CellInfo was added as an
experiment when CellInfo was first created. There
was optimism that highly precise timestamps would
be useful and available; however, in practice no
vendors are known to support precise timestamps
from the modem. Having a consistent timestap that
has a reference source available to apps is more
valuable than this flexibility. Thus, the reference
will always be nanotime since Android system boot,
and the timestamps will always be stamped by the
Android framework when the records are retrieved
from the modem.
Bug:
36971551
Test: atest FrameworksTelephonyTests
Change-Id: Ic5340b6c03ddc36aa00e7694c85b3af27128652e
Mathew Inwood [Fri, 14 Sep 2018 11:35:36 +0000 (12:35 +0100)]
Move some members to the "Q blacklist".
Based on some analysis, these fields/methods are likely false positives.
Set maxTargetSdk=P so that any apps using them are required to migrate off
them in future. See the bug for more details.
Exempted-From-Owner-Approval: Automatic changes to the codebase
affecting only @UnsupportedAppUsage annotations, themselves added
without requiring owners approval earlier.
Bug:
115609023
Test: m
Merged-In: I719b5c94e5b1f4fa562dd5d655953422958ad37e
Change-Id: I719b5c94e5b1f4fa562dd5d655953422958ad37e
(cherry picked from commit
8c854f86a477fbbee38092f449333e1425e5cd7e)
Treehugger Robot [Mon, 22 Oct 2018 23:13:34 +0000 (23:13 +0000)]
Merge "Clarify createScaledBitmap's 'filter' docs"
Treehugger Robot [Mon, 22 Oct 2018 22:38:20 +0000 (22:38 +0000)]
Merge "Move startop/tools/view_compiler to startop/view_compiler"
Nathan Harold [Mon, 22 Oct 2018 22:07:06 +0000 (15:07 -0700)]
Add getMobileNetworkOperator to CellIdentityTdscdma
For consistency with CellIdentityLte, Wcdma, and Gsm
adding this function. It will aid in future refactors
to possibly create a common interface for these classes.
Bug:
111808089
Test: compilation
Change-Id: Ia6b21bcc368089d8346951ae9476e7eb12a05130
Tyler Gunn [Mon, 22 Oct 2018 21:26:19 +0000 (14:26 -0700)]
Re-add removed APIs per API council feedback.
Some APIs were removed erroneously in the Q release; these methods were
just deprecated in Q,
Test: Make API, build
Bug:
116801893
Change-Id: I38ddf8bcd9fe39f4ba50bc892ac2f6d20209f7a9
Treehugger Robot [Mon, 22 Oct 2018 21:12:56 +0000 (21:12 +0000)]
Merge "Add @Nullable for getSubscriptionIds"
Malcolm Chen [Tue, 25 Sep 2018 03:01:32 +0000 (20:01 -0700)]
Add PhoneStateListener#onPreferredDataSubIdChanged
When SubscriptionManager#SetPreferredData changes preferredDataSub,
SubscriptionController notifies TelephonyRegistry and then notifies
all PhoneStateListeners that listen to the event.
Bug:
115550764
Test: unittest
Change-Id: Icb0b349b9f07a52d7d9c5e8512f731986f1a1fa3
Merged-In: Icb0b349b9f07a52d7d9c5e8512f731986f1a1fa3
Malcolm Chen [Wed, 10 Oct 2018 01:15:21 +0000 (18:15 -0700)]
Add @NonNull in SubMgr#getOpportunisticSubscriptions return value.
Bug:
116117273
Test: build
Change-Id: I1b831ea7fc1eff78c262ae6f3b6ee91a72e1f5a9
Merged-In: I1b831ea7fc1eff78c262ae6f3b6ee91a72e1f5a9
Chih-hung Hsieh [Mon, 22 Oct 2018 20:37:32 +0000 (20:37 +0000)]
Merge "Allow implicit-fallthrough warnings locally."
John Reck [Mon, 22 Oct 2018 20:23:12 +0000 (13:23 -0700)]
Clarify createScaledBitmap's 'filter' docs
Reddit complained the docs were bad, so make the docs less bad.
Test: none
Change-Id: I61928ea859af4ce0a63a9b545ea1b6dd965cc3df
Hans Boehm [Mon, 22 Oct 2018 20:20:38 +0000 (20:20 +0000)]
Merge "Remove NotificationVisibility storage pool"
Brad Ebinger [Mon, 24 Sep 2018 20:13:55 +0000 (13:13 -0700)]
Adds new Public ImsManager API
Exposes IMS functionality using new ImsManager API.
Bug:
116493310
Bug:
112538960
Bug:
112866475
Test: Telephony Unit Tests
Merged-In: I856fd7edd7a8b6085567ae6de12340f9086a4903
Change-Id: I856fd7edd7a8b6085567ae6de12340f9086a4903
Eric Laurent [Mon, 22 Oct 2018 18:42:18 +0000 (18:42 +0000)]
Merge "Fixed unsafe lock upon safe media volume"
Eric Holk [Thu, 11 Oct 2018 21:20:39 +0000 (14:20 -0700)]
Move startop/tools/view_compiler to startop/view_compiler
This is planned to ship on device, so by convention the view_compiler should not
be in a tools directory.
Change-Id: I0eb03812d77ec38edc3908725acb40bacb345ecd
Chen Xu [Mon, 22 Oct 2018 17:30:16 +0000 (17:30 +0000)]
Merge "NWRegState.getAccessNetworkTechnology in sync with SS.getNetworkType"
Chih-Hung Hsieh [Mon, 22 Oct 2018 16:56:12 +0000 (09:56 -0700)]
Allow implicit-fallthrough warnings locally.
It will be a global error by default.
Test: make checkbuild
Bug:
112564944
Change-Id: I26616fd50ccf3639fa7c01d850a14d079273ede7
Exempt-From-Owner-Approval: do not block on new warnings
Chen Xu [Mon, 22 Oct 2018 16:53:18 +0000 (16:53 +0000)]
Merge "Need to check empty not null for String"
Chen Xu [Mon, 22 Oct 2018 16:36:25 +0000 (16:36 +0000)]
Merge changes from topic "carrier_id_aosp_cp"
* changes:
support mno carrier id
support privilege access rule for carrier identification