OSDN Git Service

android-x86/frameworks-base.git
5 years agostatsd: Add missing AIDs to UidMap
Igor Murashkin [Thu, 4 Oct 2018 21:30:48 +0000 (14:30 -0700)]
statsd: Add missing AIDs to UidMap

Change-Id: I29f52727d344755a0c465105eb3a2c81b2bec700

5 years agostartop: Add iorapd binder integration test
Igor Murashkin [Fri, 28 Sep 2018 23:48:13 +0000 (16:48 -0700)]
startop: Add iorapd binder integration test

Connects to the binder 'iorapd' service as a client
and tests round-trip callback functionality.

Also adds mockito-inline to the test build, allowing us to mock
any class/methods, even if it's static or final.

Note: selinux is currently not supported, need to use
 $> adb shell setenforce 0

Prior to running any tests relying on binder connectivity.

Bug: 72170747
Test: atest libiorap-java-tests
Change-Id: Id5ba579845105e331d764838c357924810a64c6c

5 years agostartop: Add iorap parcelables for AIDL interfaces
Igor Murashkin [Wed, 26 Sep 2018 00:55:54 +0000 (17:55 -0700)]
startop: Add iorap parcelables for AIDL interfaces

Bug: 72170747
Test: atest frameworks/base/startop/iorap
Change-Id: Icd3feebcd2342e66b63fbb0c0e8f08bade618c76

5 years agoMerge "Unhide the LE CoC APIs"
Treehugger Robot [Tue, 18 Sep 2018 18:31:26 +0000 (18:31 +0000)]
Merge "Unhide the LE CoC APIs"

5 years agoMerge "Rename the ojluni-annotated-stubs target."
Treehugger Robot [Tue, 18 Sep 2018 16:27:21 +0000 (16:27 +0000)]
Merge "Rename the ojluni-annotated-stubs target."

5 years agoMerge "Add dummy WmTests"
Treehugger Robot [Tue, 18 Sep 2018 15:21:17 +0000 (15:21 +0000)]
Merge "Add dummy WmTests"

5 years agoMerge "Separate servicestests/utils"
Treehugger Robot [Tue, 18 Sep 2018 15:20:50 +0000 (15:20 +0000)]
Merge "Separate servicestests/utils"

5 years agoMerge "Whitelist com.android.proxyhandler for power"
Treehugger Robot [Tue, 18 Sep 2018 13:31:58 +0000 (13:31 +0000)]
Merge "Whitelist com.android.proxyhandler for power"

5 years agoAdd dummy WmTests
Tadashi G. Takaoka [Fri, 14 Sep 2018 05:06:55 +0000 (14:06 +0900)]
Add dummy WmTests

Test: atest WmTests
Bug: 113800711
Merged-In: I1e29cc9116adf2d08c00d035ecad48e4ef604106
Change-Id: Ifcbd8cf4545ec80058dc25ef15f5af81a9780cc3
(cherry picked from commit bc7bc12fee108bdbeb881e9c41003db0f9046373)

5 years agoSeparate servicestests/utils
Tadashi G. Takaoka [Fri, 14 Sep 2018 04:58:44 +0000 (13:58 +0900)]
Separate servicestests/utils

The test utility classes under com.android.server.testutils are moved
to servicestests/utils directory in order to easily be shared between
FrameworksServiceTests and upcomming WmTests.

Test: tradefed.sh run commandAndExit FrameworksServicesTests \
    --include-annotation android.platform.test.annotations.Presubmit \
    --exclude-annotation androidx.test.filters.FlakyTest
Bug: 113800711
Merged-In: I39c623a286df1067fffadc25c8a49c12cc05c82c
Change-Id: I71cd7b417641b5e969bef6f3076020bfc1dfffa7
(cherry picked from commit 77439ba9b3a8c50e7c4c0a69b3c316eb82130ad5)

5 years agoMerge changes I66bbe8b5,Ie54677db
David Brazdil [Tue, 18 Sep 2018 04:02:34 +0000 (04:02 +0000)]
Merge changes I66bbe8b5,Ie54677db

* changes:
  Add api to hidden API light grey
  Add new entries to hidden API light grey

5 years agoMerge "Change the dist path of api files"
Treehugger Robot [Tue, 18 Sep 2018 02:29:44 +0000 (02:29 +0000)]
Merge "Change the dist path of api files"

5 years agoMerge "Fix typo in IntentFilter documentation."
Treehugger Robot [Tue, 18 Sep 2018 01:44:46 +0000 (01:44 +0000)]
Merge "Fix typo in IntentFilter documentation."

5 years agoMerge "Revert "preloaded-classes: remove core HIDL libs""
Steven Moreland [Mon, 17 Sep 2018 23:40:39 +0000 (23:40 +0000)]
Merge "Revert "preloaded-classes: remove core HIDL libs""

5 years agoMerge "Enable enhanced call blocking by default."
Treehugger Robot [Mon, 17 Sep 2018 22:47:23 +0000 (22:47 +0000)]
Merge "Enable enhanced call blocking by default."

5 years agoMerge "Frameworks: Replace deprecated MetricsLogger usage"
Treehugger Robot [Mon, 17 Sep 2018 19:09:17 +0000 (19:09 +0000)]
Merge "Frameworks: Replace deprecated MetricsLogger usage"

5 years agoRevert "preloaded-classes: remove core HIDL libs"
Steven Moreland [Mon, 17 Sep 2018 18:11:02 +0000 (18:11 +0000)]
Revert "preloaded-classes: remove core HIDL libs"

This reverts commit 766b425c27f128d507cc5101c01d7c4bf107dbca.

Appears to be the cause of a 14ms regression in wifi startup time in system server that could be offset here (and potentially other places) by keeping the preload in zygote. A local trial of five showed this revert to take it 111.2ms -> 108ms. The variance is likely too high for this to be significant, however, logically, in the short term, these libraries are being used, and so preloading makes sense. I'll leave further changes to this list to the owners of this list.

Test: boot walleye 5 times w/ and w/o this test, and find small gain in reverting this.
Reason for revert: b/115771598

Change-Id: Ia53dbe8b70900d6f04011b15cbdddf786378fc3b

5 years agoMerge "Expose android.icu.text.CaseMap API"
vichang [Mon, 17 Sep 2018 18:10:31 +0000 (18:10 +0000)]
Merge "Expose android.icu.text.CaseMap API"

5 years agoMerge "Unifying source of statsd BleScan calls and cleaning it up."
Treehugger Robot [Mon, 17 Sep 2018 17:46:01 +0000 (17:46 +0000)]
Merge "Unifying source of statsd BleScan calls and cleaning it up."

5 years agoMerge "Increase customization options for wfcSpnFormats"
Youming Ye [Mon, 17 Sep 2018 16:55:14 +0000 (16:55 +0000)]
Merge "Increase customization options for wfcSpnFormats"

5 years agoRename the ojluni-annotated-stubs target.
Pete Gillin [Mon, 17 Sep 2018 14:45:33 +0000 (15:45 +0100)]
Rename the ojluni-annotated-stubs target.

All of the annotations under this are intended for use in the SDK. In
order to make this clear (because other types of annotations are
planned), this change renames the target to
ojluni-annotated-sdk-stubs.

Bug: 115746226
Test: `make api-stubs-docs`
Change-Id: I11366b6293b681cb4c8118fc117601a671c33282

5 years agoMerge "Add feature flag in Settings."
Yuanjia Hsu [Mon, 17 Sep 2018 13:43:08 +0000 (13:43 +0000)]
Merge "Add feature flag in Settings."

5 years agoMerge "Update greylist for Conscrypt update"
Adam Vartanian [Mon, 17 Sep 2018 12:36:50 +0000 (12:36 +0000)]
Merge "Update greylist for Conscrypt update"

5 years agoMerge "Add extra data when starting emergency dialer intent"
Shaotang Li [Mon, 17 Sep 2018 04:14:51 +0000 (04:14 +0000)]
Merge "Add extra data when starting emergency dialer intent"

5 years agoFrameworks: Replace deprecated MetricsLogger usage
Andreas Gampe [Sat, 15 Sep 2018 18:27:58 +0000 (11:27 -0700)]
Frameworks: Replace deprecated MetricsLogger usage

Update OtaDexoptService to use an instance of MetricsLogger.

Test: m
Change-Id: I8892430392a9d3b4ca25dd52643d21cab7d36b78

5 years agoAdd api to hidden API light grey
David Brazdil [Sat, 15 Sep 2018 02:48:06 +0000 (03:48 +0100)]
Add api to hidden API light grey

Bug: 115409173
Test: m appcompat
Change-Id: I66bbe8b5cd1eed56c2dba74aac05f7a0baaff260

5 years agoAdd new entries to hidden API light grey
David Brazdil [Fri, 14 Sep 2018 12:51:46 +0000 (13:51 +0100)]
Add new entries to hidden API light grey

Bug: 115479641
Test: m appcompat
Change-Id: Ie54677db0370ad1da8a5ed6253027a2e789ca5bc

5 years agoMerge "Don't fail if there are no comments."
Treehugger Robot [Sat, 15 Sep 2018 02:41:13 +0000 (02:41 +0000)]
Merge "Don't fail if there are no comments."

5 years agoMerge "Don't Use NPE for Flow Control in getCellLocation"
Treehugger Robot [Sat, 15 Sep 2018 00:23:28 +0000 (00:23 +0000)]
Merge "Don't Use NPE for Flow Control in getCellLocation"

5 years agoMerge "libandroid_runtime: Link libselinux dynamically instead of statically."
Peter Collingbourne [Fri, 14 Sep 2018 22:45:55 +0000 (22:45 +0000)]
Merge "libandroid_runtime: Link libselinux dynamically instead of statically."

5 years agoDon't fail if there are no comments.
Mathew Inwood [Fri, 14 Sep 2018 14:19:10 +0000 (15:19 +0100)]
Don't fail if there are no comments.

Grep exits with non-zero if it find no matches. But it doesn't matter in
this case, so just carry on.

Test: frameworks/base/tools/hiddenapi/sort_api.sh \
Test:    frameworks/base/config/hiddenapi-light-greylist.txt
Change-Id: I7c219ee617f7dfa3cff5232ab979cc4ba38ebbfd

5 years agoMerge "Use IPv6 hop limit from upstream interface."
Treehugger Robot [Fri, 14 Sep 2018 11:21:37 +0000 (11:21 +0000)]
Merge "Use IPv6 hop limit from upstream interface."

5 years agoUse IPv6 hop limit from upstream interface.
Erik Kline [Fri, 14 Sep 2018 07:25:54 +0000 (16:25 +0900)]
Use IPv6 hop limit from upstream interface.

Test: as follows
    - built, flashed, booted
    - runtest frameworks-net passes
    - manually setting /proc/sys/net/ipv6/<upiface>/conf/hop_limit
      to various value yields RAs with expected hop limit settings
      in downstream RAs
Bug: 32163131
Change-Id: I248154ca9d836318bf21a2971d0884040525d9fc

5 years agoMerge "Migrate all offline/online sdk docs generation to use Metalava"
Treehugger Robot [Thu, 13 Sep 2018 22:44:35 +0000 (22:44 +0000)]
Merge "Migrate all offline/online sdk docs generation to use Metalava"

5 years agolibandroid_runtime: Link libselinux dynamically instead of statically.
Peter Collingbourne [Thu, 13 Sep 2018 21:30:25 +0000 (14:30 -0700)]
libandroid_runtime: Link libselinux dynamically instead of statically.

5 years agoUnhide the LE CoC APIs
Stanley Tng [Fri, 29 Jun 2018 21:05:04 +0000 (14:05 -0700)]
Unhide the LE CoC APIs

Expose the LE Connection-oriented Channels APIs for applications to use.

Test: Run the SL4A ACTS test: BleCocTest
Bug: 70683224
Change-Id: I68128bc7154966ec065091c973351f8892da9b4d

5 years agoUnifying source of statsd BleScan calls and cleaning it up.
Bookatz [Thu, 13 Sep 2018 18:38:56 +0000 (11:38 -0700)]
Unifying source of statsd BleScan calls and cleaning it up.

Bug: 80308558
Test: cts-tradefed run cts-dev -m CtsStatsdHostTestCases
Change-Id: I0b4a0b56631b4354b73f0fafea2c0dc7dff248d1

5 years agoMerge "Leave spaces between Operator name and Clock in StatusBar"
Evan Laird [Thu, 13 Sep 2018 17:24:09 +0000 (17:24 +0000)]
Merge "Leave spaces between Operator name and Clock in StatusBar"

5 years agoMerge changes from topic "remove-hidl-boot-jars"
Steven Moreland [Thu, 13 Sep 2018 15:14:35 +0000 (15:14 +0000)]
Merge changes from topic "remove-hidl-boot-jars"

* changes:
  pm: Add hidl libraries to old class paths.
  preloaded-classes: remove core HIDL libs

5 years agoLeave spaces between Operator name and Clock in StatusBar
Shigeki Yokomichi [Wed, 11 Apr 2018 06:46:00 +0000 (15:46 +0900)]
Leave spaces between Operator name and Clock in StatusBar

In StatusBar, there are no spaces between Operator name and Clock,
so leaving spaces to improve design.

Bug: 114133664
Test: Manual, enable operator name in status row
config_showOperatorNameInStatusBar, insert sim card with operator name,
watch status row.

Change-Id: I1a2e33436ed50d429ae4b1769d0a72d501233a22

5 years agoMerge "Initial rename to IpServer"
Erik Kline [Thu, 13 Sep 2018 10:28:27 +0000 (10:28 +0000)]
Merge "Initial rename to IpServer"

5 years agoUpdate greylist for Conscrypt update
Adam Vartanian [Wed, 12 Sep 2018 09:52:52 +0000 (10:52 +0100)]
Update greylist for Conscrypt update

Conscrypt has been refactored to eliminate the ConscryptSocketBase
class, so its greylisted methods no longer exist.

Test: make droid
Change-Id: Iffcfe529d960a397d0ced012f5a97de93dde69fa

5 years agoInitial rename to IpServer
Erik Kline [Mon, 27 Aug 2018 08:26:47 +0000 (17:26 +0900)]
Initial rename to IpServer

Rename TetherInterfaceStateMachine to IpServer. IControlsTethering
is folded into IpServer.Callback and some of the dependencies in
TetheringDependencies are moved into IpServer.Dependencies.

Several things still need fixing, including:
    - convert message passing into method calls
    - the calls that enable forwarding should be moved up out of
      IpServer into the Tethering layer above it

Test: as follows
    - built, flashed, booted
    - runtest frameworks-net passes
Change-Id: I015f800ed23c8aa5c8c81a74d7b508abfcaab659

5 years agoMerge "Remove the last of the ResolvUtil uses"
Treehugger Robot [Thu, 13 Sep 2018 06:39:16 +0000 (06:39 +0000)]
Merge "Remove the last of the ResolvUtil uses"

5 years agoMerge "Add new telecom metrics for emergency dialer"
Shaotang Li [Thu, 13 Sep 2018 05:59:51 +0000 (05:59 +0000)]
Merge "Add new telecom metrics for emergency dialer"

5 years agoMerge "Bandwidth-related commands porting"
Luke Huang [Thu, 13 Sep 2018 03:01:22 +0000 (03:01 +0000)]
Merge "Bandwidth-related commands porting"

5 years agoMerge "Simplify logic for connect in HfpClientProfile"
Treehugger Robot [Thu, 13 Sep 2018 03:00:19 +0000 (03:00 +0000)]
Merge "Simplify logic for connect in HfpClientProfile"

5 years agoMerge "Simplify logic for connect in A2dpSinkProfile"
Treehugger Robot [Thu, 13 Sep 2018 02:58:50 +0000 (02:58 +0000)]
Merge "Simplify logic for connect in A2dpSinkProfile"

5 years agoMerge "Add New TelephonyManager APIs"
Pengquan Meng [Thu, 13 Sep 2018 01:09:47 +0000 (01:09 +0000)]
Merge "Add New TelephonyManager APIs"

5 years agoEnable enhanced call blocking by default.
Tyler Gunn [Thu, 13 Sep 2018 00:50:49 +0000 (17:50 -0700)]
Enable enhanced call blocking by default.

Enable the enhanced call blocking options by default.  This provides
the ability to block:
- private callers - those who have intentionally blocked their number.
- calls from payphones (they still exist)
- unknown callers (not the same as restricted; network may not be able to
determine the number of the caller)
- numbers not in contacts

These options are available in the blocked number screen (on AOSP
from the dialer app go to settings --> Blocked Numbers).

Test: Manual - confirm enhanced call blocking options are available.
Bug: 63966743
Change-Id: I5aab0714774a5406568d6cd04a4d7074a3261c44

5 years agoMigrate all offline/online sdk docs generation to use Metalava
Nan Zhang [Wed, 22 Aug 2018 18:27:31 +0000 (11:27 -0700)]
Migrate all offline/online sdk docs generation to use Metalava

These targets all depend on libcore sources which are blocker for us to
enable java9 feature, so convert them to Metalava.

Also enable API level annotations for api-stubs-docs, offline-sdk-docs,
and online-sdk-docs.

Test: m -j docs
Bug: b/78245848
Change-Id: I354d699a79cc5e6580b50e0613e7602c77b9c0b5

5 years agoMerge "OMS: fix typos in permission check message"
Treehugger Robot [Wed, 12 Sep 2018 22:26:26 +0000 (22:26 +0000)]
Merge "OMS: fix typos in permission check message"

5 years agoMerge "ByteBucketArray.h: fix typo"
Treehugger Robot [Wed, 12 Sep 2018 22:26:22 +0000 (22:26 +0000)]
Merge "ByteBucketArray.h: fix typo"

5 years agoMerge "Update TelephonyManager document"
Pengquan Meng [Wed, 12 Sep 2018 22:12:15 +0000 (22:12 +0000)]
Merge "Update TelephonyManager document"

5 years agoMerge "Restrict IMM.notifyUserAction() with targetSdkVersion <= P"
Treehugger Robot [Wed, 12 Sep 2018 19:04:40 +0000 (19:04 +0000)]
Merge "Restrict IMM.notifyUserAction() with targetSdkVersion <= P"

5 years agoMerge "Use UID as requestID"
Benedict Wong [Wed, 12 Sep 2018 18:51:33 +0000 (18:51 +0000)]
Merge "Use UID as requestID"

5 years agoMerge "For metalava target, use droidstubs instead of droiddoc"
Nan Zhang [Wed, 12 Sep 2018 18:15:11 +0000 (18:15 +0000)]
Merge "For metalava target, use droidstubs instead of droiddoc"

5 years agoMerge "Remove IInputMethodManager.getEnabledInputMethodList() from greylist"
Treehugger Robot [Wed, 12 Sep 2018 17:29:55 +0000 (17:29 +0000)]
Merge "Remove IInputMethodManager.getEnabledInputMethodList() from greylist"

5 years agoUpdate TelephonyManager document
Pengquan Meng [Tue, 28 Aug 2018 01:50:30 +0000 (18:50 -0700)]
Update TelephonyManager document

Bug: 111453847
Test: build
Merged-In: Ief746e771dc9435782dec75cf2259d5b9f040c27
Change-Id: Ief746e771dc9435782dec75cf2259d5b9f040c27

5 years agoMerge "Use multiple patterns and emails in per-file syntax."
Chih-hung Hsieh [Wed, 12 Sep 2018 16:27:02 +0000 (16:27 +0000)]
Merge "Use multiple patterns and emails in per-file syntax."

5 years agopm: Add hidl libraries to old class paths.
Steven Moreland [Tue, 4 Sep 2018 20:20:22 +0000 (13:20 -0700)]
pm: Add hidl libraries to old class paths.

These two libraries:
android.hidl.base-V1.0-java
android.hidl.manager-V1.0-java

are being removed from BOOT_JARS. This change facilitates linking to them
for libraries or prebuilts in or before P.

Test: atest android.content.pm.AndroidHidlUpdaterTest
Bug: 77307025

Change-Id: Ic0db24cc68d66f5dbfab126ce7e304eec0bfc969

5 years agopreloaded-classes: remove core HIDL libs
Steven Moreland [Thu, 16 Aug 2018 19:32:36 +0000 (12:32 -0700)]
preloaded-classes: remove core HIDL libs

These are being removed from boot jars.

Test: (sanity) boot device, no longer see 'Class not found for preloading'
Bug: 77307025
Change-Id: I854d3397ff362495ff392c2c4ea8594d1b2449bd

5 years agoMerge "Fix typo in android.net.Uri documentation."
Treehugger Robot [Wed, 12 Sep 2018 15:33:36 +0000 (15:33 +0000)]
Merge "Fix typo in android.net.Uri documentation."

5 years agoSimplify logic for connect in HfpClientProfile
Chienyuan [Wed, 5 Sep 2018 12:29:23 +0000 (20:29 +0800)]
Simplify logic for connect in HfpClientProfile

* connect: remove connected device check logic.
  HeadsetClientStateMachine will check it.
* Remove member variable V and related checks.
* wrap if/else statement in curly brackets.
* add robotest for HfpClientProfile.

Bug: 111812003
Test: make -j42 RunSettingsLibRoboTests ROBOTEST_FILTER=HfpClientProfileTest
Change-Id: Ie36efd6d0a9f8e6501a3690b026ea4bd39744b5c
Merged-In: Ie36efd6d0a9f8e6501a3690b026ea4bd39744b5c

5 years agoSimplify logic for connect in A2dpSinkProfile
Chienyuan [Wed, 5 Sep 2018 13:28:59 +0000 (21:28 +0800)]
Simplify logic for connect in A2dpSinkProfile

* connect: remove connected device check logic. A2dpSinkService
  will check it.
* Remove member variable V and related checks.
* wrap if/else statement in curly brackets.
* add robotest for A2dpSinkProfile.

Bug: 111812003
Test: make -j42 RunSettingsLibRoboTests ROBOTEST_FILTER=A2dpSinkProfileTest
Change-Id: Ia0a118d73e5bb35ed3b2b75e67aeb98ae936981f
Merged-In: Ia0a118d73e5bb35ed3b2b75e67aeb98ae936981f

5 years agoRemove the last of the ResolvUtil uses
Erik Kline [Wed, 12 Sep 2018 05:37:11 +0000 (14:37 +0900)]
Remove the last of the ResolvUtil uses

This is the completion of cleanup work started in aosp/674269.
Consequently, also remove ResolvUtil.

Test: as follows
    - built, flashed, booted
    - runtest frameworks-net passes
    - presubmit
Bug: 64133961
Bug: 72345192
Bug: 73872000
Bug: 78548486
Change-Id: I980f8a9b67f3f06f2d97a60f8e58e92c36316d40

5 years agoMerge "Fix ConcurrentModificationException crash due to race in IpClient"
Treehugger Robot [Wed, 12 Sep 2018 04:32:19 +0000 (04:32 +0000)]
Merge "Fix ConcurrentModificationException crash due to race in IpClient"

5 years agoFix ConcurrentModificationException crash due to race in IpClient
Jacob Abrams [Tue, 11 Sep 2018 00:00:46 +0000 (17:00 -0700)]
Fix ConcurrentModificationException crash due to race in IpClient

Bug: https://issuetracker.google.com/issues/114838819

Test: manual
Change-Id: Ifd1522ccaca10c0416fc2d00641c4effee37fc6c

5 years agoMerge "Make SubscriptionManager.isValidSubscriptionId public"
Treehugger Robot [Tue, 11 Sep 2018 23:47:31 +0000 (23:47 +0000)]
Merge "Make SubscriptionManager.isValidSubscriptionId public"

5 years agoMerge "Avoiding potential NPE when dumping to proto."
Mike Ma [Tue, 11 Sep 2018 23:28:39 +0000 (23:28 +0000)]
Merge "Avoiding potential NPE when dumping to proto."

5 years agoFor metalava target, use droidstubs instead of droiddoc
Nan Zhang [Tue, 11 Sep 2018 01:58:39 +0000 (18:58 -0700)]
For metalava target, use droidstubs instead of droiddoc

droidstubs is used to generate stubs files only.

Test: m -j api-stubs-docs
Bug: b/8d0763849
Change-Id: Ia7c3d19ed2ec7b0f5b96008e5780dbcd5a32402b

5 years agoAdd New TelephonyManager APIs
Pengquan Meng [Thu, 6 Sep 2018 17:27:01 +0000 (10:27 -0700)]
Add New TelephonyManager APIs

Bug:111453847
Test: build test
Merged-In: I83a5f4149f92ce495cd066f7158e7ff37a66894f
Change-Id: I83a5f4149f92ce495cd066f7158e7ff37a66894f

5 years agoMerge "DO NOT MERGE base: getDataUsageInfo get cycle validation"
Treehugger Robot [Tue, 11 Sep 2018 22:02:49 +0000 (22:02 +0000)]
Merge "DO NOT MERGE base: getDataUsageInfo get cycle validation"

5 years agoMerge changes from topic "ownerz"
Jeff Sharkey [Tue, 11 Sep 2018 21:35:36 +0000 (21:35 +0000)]
Merge changes from topic "ownerz"

* changes:
  Tweaks to AOSP upload hook logic.
  Upload hook that guides people towards AOSP.

5 years agoRemove IInputMethodManager.getEnabledInputMethodList() from greylist
Yohei Yukawa [Tue, 11 Sep 2018 20:48:02 +0000 (13:48 -0700)]
Remove IInputMethodManager.getEnabledInputMethodList() from greylist

App developers must never need to call this IPC method directly via
reflection.  The same functionality has been exposed as a public API
InputMethodManager#getEnabledInputMethodList() since its beggining.

Just for the record, this is what
InputMethodManager#getEnabledInputMethodList() is doing.

  public List<InputMethodInfo> getEnabledInputMethodList() {
      try {
          return mService.getEnabledInputMethodList();
      } catch (RemoteException e) {
          throw e.rethrowFromSystemServer();
      }
  }

Bug: 112722706
Test: compile
Merged-In: Idf9fa866f73dbd151bb67f60dbd57041d9055a23
Change-Id: Idf9fa866f73dbd151bb67f60dbd57041d9055a23

5 years agoDO NOT MERGE base: getDataUsageInfo get cycle validation
John Zhao [Wed, 5 Sep 2018 16:29:31 +0000 (00:29 +0800)]
DO NOT MERGE base: getDataUsageInfo get cycle validation

When the DataUsageController calculate the DataUsageInfo
based on the cycle from NetworkPolicyManager, that cycle
should be not null. Otherwise, it couldn't be used to do
operation like toInstant() directly.

The error could be got from logcat is as:
E AndroidRuntime: Caused by: java.lang.NullPointerException:
Attempt to invoke virtual method 'java.time.Instant
java.time.ZonedDateTime.toInstant()' on a null object reference

E AndroidRuntime:          at com.android.settingslib.net.
DataUsageController.getDataUsageInfo
(DataUsageController.java:140)

Inside of the core/java/android/net/NetworkPolicyManager.java:
public static Iterator<Pair<ZonedDateTime, ZonedDateTime>>
 cycleIterator(NetworkPolicy policy) {
... ...
return Pair.create(null, null);
... ...
}
That should be avoided.

Considering it could be happened in the NetworkPolicyManager side,
and it is reasonable if it did it, validating operation is better
to be considered by any caller such as the DataUsageController.

Bug: 113952713

Test: specify the hasNext to be false but the DataUsageController
don't crash.

Change-Id: I2469c129a160e30615ea6011adf18688f951eac8
Signed-off-by: John Zhao <yuankuiz@qualcomm.corp-partner.google.com>
5 years agoRestrict IMM.notifyUserAction() with targetSdkVersion <= P
Yohei Yukawa [Tue, 11 Sep 2018 20:34:36 +0000 (13:34 -0700)]
Restrict IMM.notifyUserAction() with targetSdkVersion <= P

With my change [1] in Android N, applications no longer need to
manually call this hidden API even when directly implementing
InputConnection interface without extending BaseInputConnection [2].

So far applications that we have confirmed to be using this hidden API
is Chromium and browsers that are supposed to be built on top of
Chromium source code [3].  Actually my change [1] was per request from
Chromium team and Chromium does not use this hidden API on Android N
and later devices [4].

Moving forward, with this CL applications that target API 29 and later
are no longer allowed to use this hidden API since we see no actual
use case of this hidden API on Android N and later devices so far.

If you have any reason to continue relying on this hidden API, please
leave a comment in Bug 114740982.

 [1]: I571d6cc9c6e461d8994aa7496e7e18be13766411
      159dd47db34151314e2449347251ad32b30e5ea1
 [2]: This scenario had not been suppored until Android N.
      See also other CLs that are tagged with Bug 24688781.
 [3]: https://cs.chromium.org/chromium/src/content/public/android/java/src/org/chromium/content/browser/input/InputMethodManagerWrapperImpl.java?rcl=525c72b0f4694d6b3f93bcc7797d0411c2fa683c&l=113-128
 [4]: crbug.com/551193

Bug: 114159783
Bug: 114740982
Test: compile
Merged-In: I41d6419438cef92cce81cc33d9db00dd2ee89d33
Change-Id: Iac81f49413605271fccc0b8aec3e6ed95925f061

5 years agoMerge "Convert AudioAttribute to Stream correctly for TTS"
Treehugger Robot [Tue, 11 Sep 2018 19:26:56 +0000 (19:26 +0000)]
Merge "Convert AudioAttribute to Stream correctly for TTS"

5 years agoAvoiding potential NPE when dumping to proto.
Kweku Adams [Tue, 4 Sep 2018 18:54:46 +0000 (11:54 -0700)]
Avoiding potential NPE when dumping to proto.

Inspired by aosp/736453. Cherry-picked from ag/4934453

Bug: 113087610
Test: Android builds
Change-Id: I9f0dae9cd5a839947c7ed150980eb30b928beef7

5 years agoMake SubscriptionManager.isValidSubscriptionId public
sqian [Thu, 30 Aug 2018 18:53:14 +0000 (11:53 -0700)]
Make SubscriptionManager.isValidSubscriptionId public

And rename subId to subscriptionId.

Test: Treehugger
Bug: 113072551
Change-Id: I4bdf705d7f81bad423ed867972fd1ed7fe5717d0

5 years agoMerge "Add API to listen to opportunistic subscriptions change."
Xiangyu/Malcolm Chen [Tue, 11 Sep 2018 18:30:19 +0000 (18:30 +0000)]
Merge "Add API to listen to opportunistic subscriptions change."

5 years agoTweaks to AOSP upload hook logic.
Jeff Sharkey [Tue, 11 Sep 2018 16:36:57 +0000 (10:36 -0600)]
Tweaks to AOSP upload hook logic.

Lists all matching files, and slightly more robust path handling.

Bug: 113136846
Test: manual
Change-Id: Ic1971a3df97b8b137993b5856b47d0d706a996cd

5 years agoUpload hook that guides people towards AOSP.
Jeff Sharkey [Fri, 24 Aug 2018 04:01:53 +0000 (22:01 -0600)]
Upload hook that guides people towards AOSP.

The canonical location of certain parts of the source tree live in
AOSP, and should not be changed internally to avoid merge conflicts.

This initially starts with "OWNERS" files, but the hook can easily
be repeated to match any files based on file path regexes.

Bug: 113136846
Test: manual
Change-Id: I113e63b6133f20389d84ec0d6d8b81cdbdf35d38
Merged-In: I113e63b6133f20389d84ec0d6d8b81cdbdf35d38

5 years agoMerge "Framework: Remove a nonsensical substring(0)"
Treehugger Robot [Tue, 11 Sep 2018 16:30:36 +0000 (16:30 +0000)]
Merge "Framework: Remove a nonsensical substring(0)"

5 years agoMerge "Reset launch start times when removing a process"
Treehugger Robot [Tue, 11 Sep 2018 16:09:59 +0000 (16:09 +0000)]
Merge "Reset launch start times when removing a process"

5 years agoMerge "Revert "Check in P dark greylist, use it for hidden API list generation""
David Brazdil [Tue, 11 Sep 2018 15:27:40 +0000 (15:27 +0000)]
Merge "Revert "Check in P dark greylist, use it for hidden API list generation""

5 years agoOMS: fix typos in permission check message
Mårten Kongstad [Fri, 8 Jun 2018 06:51:13 +0000 (08:51 +0200)]
OMS: fix typos in permission check message

Calls to enforceChangeOverlayPackagesPermission and handleIncomingUser
include a string parameter to be added to the exception thrown if the
caller doesn't hold the expected permission. Fix a couple of typos in
these strings.

Test: builds, boots
Change-Id: I70256c41d61f8af3735697c6e63644e5ac46fd84

5 years agoByteBucketArray.h: fix typo
Mårten Kongstad [Wed, 28 Feb 2018 08:52:16 +0000 (09:52 +0100)]
ByteBucketArray.h: fix typo

Bug: 78815803
Test: builds, boots
Change-Id: I93d7ce5255911797d6afdb05caf0cf7dbfdc22b9

5 years agoConvert AudioAttribute to Stream correctly for TTS
Tomoharu Kasahara [Tue, 11 Sep 2018 10:14:39 +0000 (19:14 +0900)]
Convert AudioAttribute to Stream correctly for TTS

Add FLAG_BEACON for STREAM_TTS then use it for
conversion from AudioAttribute to stream type.

Bug: 113303490
Test: Use AudioAttributes.toLegacyStreamType

Change-Id: I7fa2b3f095437f8077545d1fff795bb0d8fe6b89

5 years agoRevert "Check in P dark greylist, use it for hidden API list generation"
David Brazdil [Tue, 11 Sep 2018 10:09:01 +0000 (11:09 +0100)]
Revert "Check in P dark greylist, use it for hidden API list generation"

This reverts commit 3cc74c71ef907a76547424aea6597f7b2907e9fb.
We saw app crashes due stricter classification of non-SDK APIs.

Bug: 115284625
Bug: 113881436
Test: phone boots

Change-Id: I689d0fbf66fabeffa5032e13f2f1f314c50b6cc5

5 years agoFix typo in android.net.Uri documentation.
Tobias Thierer [Tue, 11 Sep 2018 09:35:11 +0000 (10:35 +0100)]
Fix typo in android.net.Uri documentation.

This typo has been present since before the "auto import"
of cupcake sources in 2009.

Bug: 114704047
Test: Treehugger
Test: Checked through source inspection that this really returns
      the encoded form: its implementation is ssp.getEncoded(),
      whose implementation in turn is:
      return hasEncoded ? encoded : (encoded = encode(decoded));
Change-Id: I0e4fed702e6b3012429778ccbd18a495a5d69e9f

5 years agoMerge "Remove services.net JAR dependency"
Treehugger Robot [Tue, 11 Sep 2018 08:31:05 +0000 (08:31 +0000)]
Merge "Remove services.net JAR dependency"

5 years agoAdd feature flag in Settings.
yuanjiahsu [Thu, 6 Sep 2018 11:23:52 +0000 (19:23 +0800)]
Add feature flag in Settings.

User can enable/disable faster emergency phone call feature by switching
this flag from Settings, and the old flag switched by adb command was
replaced by this feature flag.

Test: Manually
Bug: 113539598
Change-Id: Ie38f4657bfd76d8386ce2a075f4ec5d0038f5c3d

5 years agoRemove services.net JAR dependency
Erik Kline [Tue, 11 Sep 2018 05:59:08 +0000 (14:59 +0900)]
Remove services.net JAR dependency

Test: as follows
    - built, flashed, booted
    - runtest frameworks-net passes
    - captive portal interaction works as expected in Private DNS
      strict mode
Bug: 64133961
Bug: 72345192
Bug: 73872000
Bug: 78548486

Merged-In: Ia2ab2fb15e7898d99d30da20699e0bbd7a5a0964
Change-Id: I290811305fd89a4fb5633b47173aaec28e9ed4b5

5 years agoMerge "Try to set the hop limit to something suitable for 64share"
Treehugger Robot [Tue, 11 Sep 2018 05:55:37 +0000 (05:55 +0000)]
Merge "Try to set the hop limit to something suitable for 64share"

5 years agoMerge "Simplify logic for disconnect and getConnectionStatus in MapProfile"
Treehugger Robot [Tue, 11 Sep 2018 03:49:37 +0000 (03:49 +0000)]
Merge "Simplify logic for disconnect and getConnectionStatus in MapProfile"

5 years agoBandwidth-related commands porting
Luke Huang [Tue, 7 Aug 2018 08:04:26 +0000 (16:04 +0800)]
Bandwidth-related commands porting

remove bandwidth enable command
netd will handle it

Test: runtest frameworks-net passes
Test: manual testing of bandwidth works
Change-Id: I2cccbc8e682e64368640bdea01f03574b3948c2a

5 years agoMerge "Stop invoke initAppOps in Camera default constructor."
Treehugger Robot [Tue, 11 Sep 2018 01:32:53 +0000 (01:32 +0000)]
Merge "Stop invoke initAppOps in Camera default constructor."

5 years agoAdd API to listen to opportunistic subscriptions change.
Malcolm Chen [Wed, 5 Sep 2018 05:12:31 +0000 (22:12 -0700)]
Add API to listen to opportunistic subscriptions change.

Add a new set of APIs so that caller can listen to
opportunistic subscriptions changes.

Bug: 92796390
Test: build
Change-Id: Iaa741141bf1bd04c4b1618d5bfeac733a0690ed8
Merged-In: Iaa741141bf1bd04c4b1618d5bfeac733a0690ed8

5 years agoReset launch start times when removing a process
Vishnu Nair [Thu, 6 Sep 2018 19:49:24 +0000 (12:49 -0700)]
Reset launch start times when removing a process

When removing an exiting process that is running foreground activities, clear the launch times for
the current windowing mode. When an app process is removed, activities from the process may be
relaunched. In the case of forceStopPackageLocked the activities are finished before any window
is drawn, and the launch time is not cleared. This will be incorrectly used to calculate launch time
for the next launched activity launched in the same windowing mode.

Bug: 80084651
Test: adb shell am start -W com.amazon.mShop.android.shopping/com.amazon.mShop.home.HomeActivity  && sleep 1 && adb shell am force-stop com.amazon.mShop.android.shopping
Merged-In: I2c4f0716c922baa1ad209b4ea1fa7ce366e0e108
Change-Id: I2c4f0716c922baa1ad209b4ea1fa7ce366e0e108