OSDN Git Service

android-x86/frameworks-base.git
6 years agoMerge changes from topic "work_mode_api1"
TreeHugger Robot [Thu, 21 Dec 2017 01:20:28 +0000 (01:20 +0000)]
Merge changes from topic "work_mode_api1"

* changes:
  Add access control to trySetWorkModeEnabled and make it public
  Merge setQuietModeEnabled and trySetQuietModeDisabled into one API

6 years agoMerge "Allow hover tooltips for disabled views."
TreeHugger Robot [Wed, 20 Dec 2017 23:15:51 +0000 (23:15 +0000)]
Merge "Allow hover tooltips for disabled views."

6 years agoMerge "Always show window divider to accessibility"
Phil Weaver [Wed, 20 Dec 2017 22:33:55 +0000 (22:33 +0000)]
Merge "Always show window divider to accessibility"

6 years agoMerge "Sort "Recent Location Requests" by recency."
Maggie Wang [Wed, 20 Dec 2017 22:31:43 +0000 (22:31 +0000)]
Merge "Sort "Recent Location Requests" by recency."

6 years agoMerge "Fix broken MenuLayoutPortraitTest"
TreeHugger Robot [Wed, 20 Dec 2017 22:24:22 +0000 (22:24 +0000)]
Merge "Fix broken MenuLayoutPortraitTest"

6 years agoMerge "Add strings for Wifi Wake onboarding notification."
Eric Schwarzenbach [Wed, 20 Dec 2017 22:02:28 +0000 (22:02 +0000)]
Merge "Add strings for Wifi Wake onboarding notification."

6 years agoSort "Recent Location Requests" by recency.
Maggie [Tue, 12 Dec 2017 02:02:36 +0000 (18:02 -0800)]
Sort "Recent Location Requests" by recency.

The list of apps with recent location requests is currently displayed in
alphabetical order on device (Settings -> Security & Location ->
Location). Sort this list by recency: (1) apps that are currently
requesting location are displayed  on the top. (2) For apps that are not currently
requesting location, the ones with most recent location request finish
time come first.

Bug: 70350519
Test: Robolectric
Test: manual
Change-Id: I5c757defcd7645d254c9c47e3c83f7e323247a71

6 years agoMerge "Add subtype for priority"
Mady Mellor [Wed, 20 Dec 2017 21:16:17 +0000 (21:16 +0000)]
Merge "Add subtype for priority"

6 years agoMerge "Improve nine patch scaling"
TreeHugger Robot [Wed, 20 Dec 2017 21:09:27 +0000 (21:09 +0000)]
Merge "Improve nine patch scaling"

6 years agoMerge "Use RecoverableKeyStoreDb in RecoverableKeyGenerator"
Robert Berry [Wed, 20 Dec 2017 21:06:55 +0000 (21:06 +0000)]
Merge "Use RecoverableKeyStoreDb in RecoverableKeyGenerator"

6 years agoMerge "Unhide HINT_HIDDEN from slices api and rename to HINT_SHORTCUT"
TreeHugger Robot [Wed, 20 Dec 2017 21:04:38 +0000 (21:04 +0000)]
Merge "Unhide HINT_HIDDEN from slices api and rename to HINT_SHORTCUT"

6 years agoMerge "Back PlatformKeyManager with database"
Robert Berry [Wed, 20 Dec 2017 21:01:33 +0000 (21:01 +0000)]
Merge "Back PlatformKeyManager with database"

6 years agoMerge "Communicate relevantEvents=0 for packages excluded from whitelist"
TreeHugger Robot [Wed, 20 Dec 2017 20:40:57 +0000 (20:40 +0000)]
Merge "Communicate relevantEvents=0 for packages excluded from whitelist"

6 years agoMerge "Improve Fragment+Loader deprecation Javadoc"
TreeHugger Robot [Wed, 20 Dec 2017 20:08:28 +0000 (20:08 +0000)]
Merge "Improve Fragment+Loader deprecation Javadoc"

6 years agoMerge "Don't include mockito in frameworks-base-testutils" am: f924642729 am: cf7aa7c09e
Philip P. Moltmann [Wed, 20 Dec 2017 19:31:34 +0000 (19:31 +0000)]
Merge "Don't include mockito in frameworks-base-testutils" am: f924642729 am: cf7aa7c09e
am: 30d2c14006  -s ours

Change-Id: Id53b8f79a485f48d942d592d4ab6192f8545e356

6 years agoMerge "Don't include mockito in frameworks-base-testutils" am: f924642729
Philip P. Moltmann [Wed, 20 Dec 2017 19:18:45 +0000 (19:18 +0000)]
Merge "Don't include mockito in frameworks-base-testutils" am: f924642729
am: cf7aa7c09e

Change-Id: I6b2486c69af1a05f8282a0d648403522adf2b471

6 years agoImprove nine patch scaling
Stan Iliev [Wed, 20 Dec 2017 17:22:59 +0000 (12:22 -0500)]
Improve nine patch scaling

Apply separate coefficient for X and Y, when scaling nine patch
lattice dividers. This is reducing rounding error and fixing
a nine patch issue in Clock app alarm background.
There are other issues in nine patch scaling (see ag/3378768).

Test: Ran clock app
Bug: 70353853
Change-Id: Ibbbfddc47767fb3314cdb88820e520b3f472e727

6 years agoMerge "Don't include mockito in frameworks-base-testutils"
Philip P. Moltmann [Wed, 20 Dec 2017 19:09:03 +0000 (19:09 +0000)]
Merge "Don't include mockito in frameworks-base-testutils"
am: f924642729

Change-Id: I4470f63baac7bc33dff0dac94da3a0d93c322dc7

6 years agoMerge "BluetoothHidDevice: rename onIntrData to onInterruptData (1/5)"
TreeHugger Robot [Wed, 20 Dec 2017 19:02:49 +0000 (19:02 +0000)]
Merge "BluetoothHidDevice: rename onIntrData to onInterruptData (1/5)"

6 years agoMerge "Make accessibility anchor id a long"
Phil Weaver [Wed, 20 Dec 2017 19:02:40 +0000 (19:02 +0000)]
Merge "Make accessibility anchor id a long"

6 years agoMerge "[ipsec-doze] Add fchown to IpSecService to support doze" am: 4edb4c8ec4 am...
Benedict Wong [Wed, 20 Dec 2017 18:58:30 +0000 (18:58 +0000)]
Merge "[ipsec-doze] Add fchown to IpSecService to support doze" am: 4edb4c8ec4 am: 5949912523
am: 53a0c20517

Change-Id: Id6a5ff71ead4566b9a91b9e9b6c78d81f1ac0f54

6 years agoMerge "Don't include mockito in frameworks-base-testutils"
Treehugger Robot [Wed, 20 Dec 2017 18:55:14 +0000 (18:55 +0000)]
Merge "Don't include mockito in frameworks-base-testutils"

6 years agoMerge "Don't include mockito in frameworks-base-testutils"
TreeHugger Robot [Wed, 20 Dec 2017 18:49:51 +0000 (18:49 +0000)]
Merge "Don't include mockito in frameworks-base-testutils"

6 years agoMerge "Fix wrong wallpaper AoD state"
TreeHugger Robot [Wed, 20 Dec 2017 18:47:20 +0000 (18:47 +0000)]
Merge "Fix wrong wallpaper AoD state"

6 years agoAdd subtype for priority
Mady Mellor [Wed, 20 Dec 2017 17:57:53 +0000 (09:57 -0800)]
Add subtype for priority

Intended to use with SliceItem type int to note the priority of an item
(such as an action) within a template.

Test: none
Bug: 68378561
Change-Id: I109adf4ea77638b7d27f3aaa7f8eb1c325287f0c

6 years agoMerge "[ipsec-doze] Add fchown to IpSecService to support doze" am: 4edb4c8ec4
Benedict Wong [Wed, 20 Dec 2017 18:42:26 +0000 (18:42 +0000)]
Merge "[ipsec-doze] Add fchown to IpSecService to support doze" am: 4edb4c8ec4
am: 5949912523

Change-Id: I9036fc2768dd9664ab7407b359f3c689c7ce700e

6 years agoCommunicate relevantEvents=0 for packages excluded from whitelist
Eugene Susla [Thu, 7 Dec 2017 19:23:50 +0000 (11:23 -0800)]
Communicate relevantEvents=0 for packages excluded from whitelist

Together with checking isObservableEventType this will result in a11y events
not being generated for packages that are excluded form a11y-service(s)
package whitelist

Test: cts-tradefed run singleCommand cts -d --module CtsAccessibilityServiceTestCases
Change-Id: Id65607aaccc7af7d870d009d609917ff3c6d0712

6 years agoMerge "[ipsec-doze] Add fchown to IpSecService to support doze"
Benedict Wong [Wed, 20 Dec 2017 18:35:45 +0000 (18:35 +0000)]
Merge "[ipsec-doze] Add fchown to IpSecService to support doze"
am: 4edb4c8ec4

Change-Id: I75a3cb9e9d9d7d3b6c0ede86074a00ddcd86028e

6 years agoMerge "[ipsec-doze] Add fchown to IpSecService to support doze"
Benedict Wong [Wed, 20 Dec 2017 18:25:32 +0000 (18:25 +0000)]
Merge "[ipsec-doze] Add fchown to IpSecService to support doze"

6 years agoImprove Fragment+Loader deprecation Javadoc
Ian Lake [Mon, 18 Dec 2017 18:36:18 +0000 (10:36 -0800)]
Improve Fragment+Loader deprecation Javadoc

Make it clear that the framework versions of
Fragments and Loaders should be replaced with their
identically named versions in the Support Library.

Reference the recent work on Lifecycle as an example
of a Support Library only change that should motivate
developers to switch to the Support Library
equivalents.

Test: Reviewed new Javadoc
BUG: 70336450
Change-Id: I93151fa0a316bba824c2e55f80f7de9d30bed3c6

6 years agoMerge "Cherrypick from from oc-mr1-dev doc: Fixing Javadoc formatting. Original-Chang...
TreeHugger Robot [Wed, 20 Dec 2017 18:06:17 +0000 (18:06 +0000)]
Merge "Cherrypick from from oc-mr1-dev doc: Fixing Javadoc formatting. Original-Change-Id: I5ee04bb96234441c5740665540b5e803fcf9710f"

6 years agoMerge changes I0face862,If2d091e5,I4e18e63f
TreeHugger Robot [Wed, 20 Dec 2017 18:05:53 +0000 (18:05 +0000)]
Merge changes I0face862,If2d091e5,I4e18e63f

* changes:
  AAPT2: Sort artifacts based on the Play Store rules.
  AAPT2: Allow empty group definitions
  AAPT2: Get list of multi-APK artifacts without APK file

6 years agoMerge "Add new Wifi settings notification drawable."
Eric Schwarzenbach [Wed, 20 Dec 2017 18:04:55 +0000 (18:04 +0000)]
Merge "Add new Wifi settings notification drawable."

6 years agoMerge "Offload switchUser calls to worker threads"
Fyodor Kupolov [Wed, 20 Dec 2017 18:03:32 +0000 (18:03 +0000)]
Merge "Offload switchUser calls to worker threads"

6 years agoMerge "Implement Call handover initiation side APIs." am: e2d080481a am: 9053309827
Sanket Padawe [Wed, 20 Dec 2017 17:57:42 +0000 (17:57 +0000)]
Merge "Implement Call handover initiation side APIs." am: e2d080481a am: 9053309827
am: 875fd19c48  -s ours

Change-Id: I2176b3a20ed52d5bae63cf30853385b33ed9f96a

6 years agoMerge "1/ index app name. 2/ fix a bug in app update."
TreeHugger Robot [Wed, 20 Dec 2017 17:50:24 +0000 (17:50 +0000)]
Merge "1/ index app name. 2/ fix a bug in app update."

6 years agoMerge "Implement Call handover initiation side APIs." am: e2d080481a
Sanket Padawe [Wed, 20 Dec 2017 17:48:58 +0000 (17:48 +0000)]
Merge "Implement Call handover initiation side APIs." am: e2d080481a
am: 9053309827

Change-Id: I98828fd1ef99d42ffbfb8650731c1d2b848bc062

6 years agoMerge "Log d when transport updates its attributes"
TreeHugger Robot [Wed, 20 Dec 2017 17:44:01 +0000 (17:44 +0000)]
Merge "Log d when transport updates its attributes"

6 years agoMerge "Implement Call handover initiation side APIs."
Sanket Padawe [Wed, 20 Dec 2017 17:41:13 +0000 (17:41 +0000)]
Merge "Implement Call handover initiation side APIs."
am: e2d080481a

Change-Id: Ib9840c4ce4abf64f36e21cbc3256050e4216314b

6 years agoMerge "Update setLineSpacing docs to mention units"
TreeHugger Robot [Wed, 20 Dec 2017 17:39:21 +0000 (17:39 +0000)]
Merge "Update setLineSpacing docs to mention units"

6 years agoMerge "Implement Call handover initiation side APIs."
Sanket Padawe [Wed, 20 Dec 2017 17:33:45 +0000 (17:33 +0000)]
Merge "Implement Call handover initiation side APIs."

6 years agoMerge "Add MessagingStyle#isGroupConversation()."
TreeHugger Robot [Wed, 20 Dec 2017 17:20:27 +0000 (17:20 +0000)]
Merge "Add MessagingStyle#isGroupConversation()."

6 years agoMerge "WorkSource: Add support for chaining attribution."
TreeHugger Robot [Wed, 20 Dec 2017 17:02:38 +0000 (17:02 +0000)]
Merge "WorkSource: Add support for chaining attribution."

6 years agoMerge "Update GLUtils to support F16"
TreeHugger Robot [Wed, 20 Dec 2017 16:53:25 +0000 (16:53 +0000)]
Merge "Update GLUtils to support F16"

6 years agoFix broken MenuLayoutPortraitTest
Aurimas Liutikas [Wed, 20 Dec 2017 16:35:22 +0000 (16:35 +0000)]
Fix broken MenuLayoutPortraitTest

Change-Id: Ic24bfbdc5d9aeb286e1f1ba589896331bb8aa2ba
Test: None

6 years agoMerge "Display Cutout: Make API public"
Adrian Roos [Wed, 20 Dec 2017 16:33:20 +0000 (16:33 +0000)]
Merge "Display Cutout: Make API public"

6 years agoBack PlatformKeyManager with database
Robert Berry [Wed, 20 Dec 2017 13:50:37 +0000 (13:50 +0000)]
Back PlatformKeyManager with database

It was previously using SharedPreferences

Test: adb shell am instrument -w -e package com.android.server.locksettings.recoverablekeystore com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Change-Id: I76a75edb93a3feca645e49162c0d8b3e9485385b

6 years agoLog d when transport updates its attributes
Bernardo Rufino [Wed, 20 Dec 2017 15:35:52 +0000 (15:35 +0000)]
Log d when transport updates its attributes

Bug: 17140907
Test: Triggered an update and checked logs
Change-Id: I21926086ec0078872f3840737f77f79417178f6c

6 years agoMerge "Merge "Add support for selecting alternate JDWP implementations" am: cbeea2386...
Android Build Merger (Role) [Wed, 20 Dec 2017 15:32:15 +0000 (15:32 +0000)]
Merge "Merge "Add support for selecting alternate JDWP implementations" am: cbeea23861 am: f5ec7f2e26 am: b24c17efa3"

6 years agoMerge "Add support for selecting alternate JDWP implementations" am: cbeea23861 am...
Alex Light [Wed, 20 Dec 2017 15:31:14 +0000 (15:31 +0000)]
Merge "Add support for selecting alternate JDWP implementations" am: cbeea23861 am: f5ec7f2e26
am: b24c17efa3

Change-Id: I200e5430fd9696affa37f6330999379173837f2b

6 years agoMerge "AAPT2: Add flag to compile command for outputting symbols"
TreeHugger Robot [Wed, 20 Dec 2017 15:27:19 +0000 (15:27 +0000)]
Merge "AAPT2: Add flag to compile command for outputting symbols"

6 years agoMerge "Add support for selecting alternate JDWP implementations" am: cbeea23861
Alex Light [Wed, 20 Dec 2017 15:21:59 +0000 (15:21 +0000)]
Merge "Add support for selecting alternate JDWP implementations" am: cbeea23861
am: f5ec7f2e26

Change-Id: I95d3064791d497986d0ece010be05749904d1ed3

6 years agoMerge "AAPT2: treat manifest validation errors as warnings when asked"
TreeHugger Robot [Wed, 20 Dec 2017 15:18:27 +0000 (15:18 +0000)]
Merge "AAPT2: treat manifest validation errors as warnings when asked"

6 years agoMerge "Add support for selecting alternate JDWP implementations"
Alex Light [Wed, 20 Dec 2017 15:13:34 +0000 (15:13 +0000)]
Merge "Add support for selecting alternate JDWP implementations"
am: cbeea23861

Change-Id: Ifa4ffb6610152f1e919bc10fc7c8697c4bb99a0d

6 years agoWorkSource: Add support for chaining attribution.
Narayan Kamath [Thu, 7 Dec 2017 15:45:33 +0000 (15:45 +0000)]
WorkSource: Add support for chaining attribution.

WorkSource objects now hold references to zero or more WorkChain
objects, each of which represent a "chain" of attribution.

This change also changes most WorkSource APIs to be able to
deal with WorkChains. Several APIs do not necessarily make sense with
WorkChains and have been left unmodified :

- boolean diff(WorkSource): Does not account for WorkChains for now.
  This is a public API so we shouln't change it unless we decide to
  make WorkChains public.
- setReturningDiffs(WorkSource): Used internally only, will be removed
  in a future change.
- addReturningNewbs(WorkSource): Used for testing only, fill be removed
  in a future change.

In addition, two new (hidden) APIs have been added to add and query
WorkChains. These APIs have only been added to facilitate testing. They
will most likely change when we add non-test users.

Co-Authored-By: Yang Lu <yanglu@google.com>
Test: WorkSourceTest
Bug: 62390666
Change-Id: Iff361eb98e079c7b2146c092dc27a3618a813c94

6 years agoMerge changes from topic "fix-atm-visibility-issues"
Paul Duffin [Wed, 20 Dec 2017 15:09:19 +0000 (15:09 +0000)]
Merge changes from topic "fix-atm-visibility-issues"

* changes:
  Add android.test.mock.stubs-system
  Fix visibility issues with android.test.mock.stubs

6 years agoMerge "Add support for selecting alternate JDWP implementations"
Alex Light [Wed, 20 Dec 2017 15:04:10 +0000 (15:04 +0000)]
Merge "Add support for selecting alternate JDWP implementations"

6 years agoAdd access control to trySetWorkModeEnabled and make it public
Tony Mak [Tue, 12 Dec 2017 11:00:37 +0000 (11:00 +0000)]
Add access control to trySetWorkModeEnabled and make it public

Test: Quick Settings -> Toggle work mode
Test: Settings -> Work profile settings -> Toggle work mode
Test: Turn off work mode -> Settings -> Turn on work mode in the suggestion
Test: Turn on work mode through tapping on work app

Test: cts-tradefed run cts-dev --module DevicePolicyManager --test com.android.cts.devicepolicy.QuietModeHostsideTest

BUG: 70212757

Change-Id: I335c3ab2306a3eb794cd35a3a7b0d184dc31f85e

6 years agoUse RecoverableKeyStoreDb in RecoverableKeyGenerator
Robert Berry [Tue, 19 Dec 2017 10:44:56 +0000 (10:44 +0000)]
Use RecoverableKeyStoreDb in RecoverableKeyGenerator

This removes the layer of abstraction provided by RecoverableKeyStorage,
as it doesn't seem particularly useful, given how easy it is to just use
the real classes in tests. This also hooks up actually saving to the
database. I've modified the class so that you can have a single instance
for generating keys and just pass the 'uid' through, rather than having
to create a new instance per uid. I think this will simplify its use.
Also it no longer returns the key handle. As you can just get it out of
the AndroidKeyStore yourself, it doesn't seem useful to have the method
also do that.

Test: adb shell am instrument -w -e package com.android.server.locksettings.recoverablekeystore com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Change-Id: Ice144a84690150648cbb5da64c8a4cecc2576349

6 years agoAAPT2: treat manifest validation errors as warnings when asked
Izabela Orlowska [Tue, 19 Dec 2017 16:22:42 +0000 (16:22 +0000)]
AAPT2: treat manifest validation errors as warnings when asked

Bug: 65670329
Test: updated
Change-Id: Ic554cc20134fce66aa9ddf8d16ddffe0131c50e9

6 years agoMerge "WorkSource: Remove unused WorkSource.stripNames."
Narayan Kamath [Wed, 20 Dec 2017 12:39:40 +0000 (12:39 +0000)]
Merge "WorkSource: Remove unused WorkSource.stripNames."

6 years agoAAPT2: Add flag to compile command for outputting symbols
Izabela Orlowska [Tue, 5 Dec 2017 12:07:28 +0000 (12:07 +0000)]
AAPT2: Add flag to compile command for outputting symbols

Only XML files can define resources inside of them, so the fragment
R.txt will only be created for XML files. The fragment R.txt will
contain files defined inside the XML files and the file itself.
For example for res/layout/my_layout.xml that defines "@+id/myView" the
fragment R.txt will contain "default int id myView" and "default int
layout my_layout".
Resources defined with the "public" keyword will have the word "public"
in the partial R.txt, resources defined with the "java-symbol" keyword
will have the word "private, and all other resources will have the word
"default".
If a string is declared in values/strings.xml as:
'<string name="foo">text</string>'
then the partial R.txt will contain "default int string foo". If the
same string is also marked as public in the values/public.xml as:
'<public type="string" name="foo" id="0x7f000001"/>
then the partial R.txt for that file will cointain:
"public int string foo".
Also, the resource IDs will be skipped as this is only for compilation,
proper IDs will be generated at linking phase.

Test: manual
Change-Id: I37d07d5ee4a9f2e5a60a54e48579eba86ae7dd60

6 years agoMerge "Deprecate StaticLayout and DynamicLayout constructors"
TreeHugger Robot [Wed, 20 Dec 2017 11:58:32 +0000 (11:58 +0000)]
Merge "Deprecate StaticLayout and DynamicLayout constructors"

6 years agoMerge "Make getGmtOffsetText public."
Joachim Sauer [Wed, 20 Dec 2017 11:23:31 +0000 (11:23 +0000)]
Merge "Make getGmtOffsetText public."

6 years agoMerge "Add storage for platform key IDs to SQLite db"
Robert Berry [Wed, 20 Dec 2017 10:49:09 +0000 (10:49 +0000)]
Merge "Add storage for platform key IDs to SQLite db"

6 years agoUpdate setLineSpacing docs to mention units
Clara Bayarri [Tue, 19 Dec 2017 16:59:34 +0000 (16:59 +0000)]
Update setLineSpacing docs to mention units

Bug: 64896499
Test: none, docs update
Change-Id: I1b94005643764f6484dca2b02845adde7135a37e

6 years agoMerge "DPM: Implement installing certificates for generated keys"
TreeHugger Robot [Wed, 20 Dec 2017 08:43:56 +0000 (08:43 +0000)]
Merge "DPM: Implement installing certificates for generated keys"

6 years agoMerge "Implement the SecureBox crypto functions"
Bo Zhu [Wed, 20 Dec 2017 08:13:12 +0000 (08:13 +0000)]
Merge "Implement the SecureBox crypto functions"

6 years agoMerge changes I7cd58841,I800bde6f
TreeHugger Robot [Wed, 20 Dec 2017 05:45:49 +0000 (05:45 +0000)]
Merge changes I7cd58841,I800bde6f

* changes:
  Implements getContextHubs
  Merges ContextHubService notion of hub ID/handle

6 years agoMerge "OutputConfiguration: Fix missing mIsShared in parcel read"
TreeHugger Robot [Wed, 20 Dec 2017 04:22:33 +0000 (04:22 +0000)]
Merge "OutputConfiguration: Fix missing mIsShared in parcel read"

6 years agoMerge "Add media routing to output chooser"
TreeHugger Robot [Wed, 20 Dec 2017 04:04:33 +0000 (04:04 +0000)]
Merge "Add media routing to output chooser"

6 years agoImplement the SecureBox crypto functions
Bo Zhu [Tue, 19 Dec 2017 00:13:38 +0000 (16:13 -0800)]
Implement the SecureBox crypto functions

SecureBox provides a set of simple interfaces for performing encryptions
and decryptions, by using a public key owned by the recipient and/or a
secret shared by the sender and the recipient.

Bug: 69056040
Change-Id: I45abd7ec5d6f1fd6f6e3ad6d84352958dd838dd7
Fixes: 69056040
Test: adb shell am instrument -w -e package com.android.server.locksettings.recoverablekeystore com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner

6 years agoMerge "Cleans up ContextHubService dumpsys"
TreeHugger Robot [Wed, 20 Dec 2017 03:24:30 +0000 (03:24 +0000)]
Merge "Cleans up ContextHubService dumpsys"

6 years agoMerge "Use getter instead of member for IEuiccController stub." am: 6991266aa6 am...
Holly Jiuyu Sun [Wed, 20 Dec 2017 03:14:26 +0000 (03:14 +0000)]
Merge "Use getter instead of member for IEuiccController stub." am: 6991266aa6 am: fe8ee59db5
am: 1f141b0b1a

Change-Id: Ia57a9c7d86b9004ae3c9e853be70a083d91eb76a

6 years agoMerge "Use getter instead of member for IEuiccController stub." am: 6991266aa6
Holly Jiuyu Sun [Wed, 20 Dec 2017 03:06:37 +0000 (03:06 +0000)]
Merge "Use getter instead of member for IEuiccController stub." am: 6991266aa6
am: fe8ee59db5

Change-Id: I96f4cca6ca0f1f75e2fd32123e6cc3d8769ce348

6 years agoMerge "Use getter instead of member for IEuiccController stub."
Holly Jiuyu Sun [Wed, 20 Dec 2017 02:59:14 +0000 (02:59 +0000)]
Merge "Use getter instead of member for IEuiccController stub."
am: 6991266aa6

Change-Id: I253f3bceb0f3c1855fada016c792bf29876e4aa1

6 years agoMerge "Decrease line count of AoD notifications"
TreeHugger Robot [Wed, 20 Dec 2017 02:57:22 +0000 (02:57 +0000)]
Merge "Decrease line count of AoD notifications"

6 years agoMerge "Use getter instead of member for IEuiccController stub."
Holly Jiuyu Sun [Wed, 20 Dec 2017 02:49:50 +0000 (02:49 +0000)]
Merge "Use getter instead of member for IEuiccController stub."

6 years agoMerge "Async handling of AMS.onUnlockUser"
TreeHugger Robot [Wed, 20 Dec 2017 02:03:43 +0000 (02:03 +0000)]
Merge "Async handling of AMS.onUnlockUser"

6 years agoMerge "ImageDecoder (BitmapFactory 2.0)"
TreeHugger Robot [Wed, 20 Dec 2017 01:36:18 +0000 (01:36 +0000)]
Merge "ImageDecoder (BitmapFactory 2.0)"

6 years agoFix wrong wallpaper AoD state
Lucas Dupin [Wed, 20 Dec 2017 01:28:31 +0000 (17:28 -0800)]
Fix wrong wallpaper AoD state

SysUI was sending the wrong AoD state to the
wallpaper because of a missing case statement.

Test: cover proximity sensor during AoD, observe.
Change-Id: I1524fd0684f0436029509a9b8655b586a76b6402

6 years agoMerge "IDMAP: Warn when RROs overlay non-overlayable resources"
Adam Lesinski [Wed, 20 Dec 2017 00:50:58 +0000 (00:50 +0000)]
Merge "IDMAP: Warn when RROs overlay non-overlayable resources"

6 years agoOffload switchUser calls to worker threads
Fyodor Kupolov [Wed, 20 Dec 2017 00:44:26 +0000 (16:44 -0800)]
Offload switchUser calls to worker threads

Some switchUser callbacks can block ActivityManager thread for 100+ ms.
The work can be done on a worker thread instead.

Test: Manual create/switch to user
Bug: 37579992
Change-Id: I45034fa8c8bdf457bcc3737c8064057fbfaf32f5

6 years agoMerge "Make TelephonyManager#getNai() public"
TreeHugger Robot [Wed, 20 Dec 2017 00:36:33 +0000 (00:36 +0000)]
Merge "Make TelephonyManager#getNai() public"

6 years agoImplement Call handover initiation side APIs.
Sanket Padawe [Fri, 1 Dec 2017 21:59:27 +0000 (13:59 -0800)]
Implement Call handover initiation side APIs.

Bug: 65415068
Test: Manual

Design doc:
https://docs.google.com/document/d/1qY3oAzjff_4A1ttYb_CGrE_OwTRmXMG_KGsIuPT1ey8/edit#

Change-Id: I692bb14fba66733154378c2dda525aa85c471a38
Merged-in: I692bb14fba66733154378c2dda525aa85c471a38

6 years agoMake getGmtOffsetText public.
Joachim Sauer [Tue, 7 Nov 2017 13:50:30 +0000 (13:50 +0000)]
Make getGmtOffsetText public.

Change getGmtOffsetText() from private to public to allow callers more
granular control over generated text.

Bug: 62255208
Test: builds
Change-Id: Idaf602ac20765a21719d4140a6e8ea30dec8672a

6 years agoMerge "atest support for app startup test"
Gopinath Elanchezhian [Tue, 19 Dec 2017 23:36:42 +0000 (23:36 +0000)]
Merge "atest support for app startup test"

6 years agoMerge "Annotate an assortment of coretest with @LargeTest"
Aurimas Liutikas [Tue, 19 Dec 2017 23:31:32 +0000 (23:31 +0000)]
Merge "Annotate an assortment of coretest with @LargeTest"

6 years agoCleans up ContextHubService dumpsys
Arthur Ishiguro [Mon, 18 Dec 2017 21:23:49 +0000 (13:23 -0800)]
Cleans up ContextHubService dumpsys

Removes fields that are not actually populated from dumpsys.

Bug: 70624255
Test: None
Change-Id: Ida272430102661d25193bc1296057a8c89297df6

6 years agoAdd MessagingStyle#isGroupConversation().
Kodlee Yin [Tue, 19 Dec 2017 19:20:50 +0000 (11:20 -0800)]
Add MessagingStyle#isGroupConversation().

This will allow apps to mark a Notification's MessagingStyle as a group
conversation. This is useful because the current implementation
overloads MessagingStyle#conversationTitle; which, when not null,
implies a group conversation. Instead of relying on this implicit
contract, we include this change's explicit field.

Test: runtest -x
core/tests/coretests/src/android/app/NotificationTest.java
Bug: 67717177
Bug: 70725009

Change-Id: I5405b6b0ca9723a06113482c04b8c2f8e1a4318c

6 years agoMerge "AAPT2: Propagate SPEC_OVERLAYABLE flag to final APK"
Adam Lesinski [Tue, 19 Dec 2017 22:42:53 +0000 (22:42 +0000)]
Merge "AAPT2: Propagate SPEC_OVERLAYABLE flag to final APK"

6 years agoUnhide HINT_HIDDEN from slices api and rename to HINT_SHORTCUT
Mady Mellor [Thu, 2 Nov 2017 21:09:12 +0000 (14:09 -0700)]
Unhide HINT_HIDDEN from slices api and rename to HINT_SHORTCUT

Test: manual, build a slice with HINT_SHORTCUT, note content doesn't appear
      in slice template but can appear when displayed as shortcut
Bug: 68378574
Change-Id: I4f7d0b8dbbcb0da4efe79a709b0d9fbf24026a6e

6 years agoAlways show window divider to accessibility
Phil Weaver [Tue, 19 Dec 2017 01:09:32 +0000 (17:09 -0800)]
Always show window divider to accessibility

Accessibility typically can only see windows that the user
can interact with. This CL carves out the split-screen
divider as an exception. The reason is that services can
use the presence of the split-screen divider to know if the
device is in split-screen mode. But the divider becomes
non-touchable if an IME appears in split-screen mode.

Services like TalkBack need some way to tell for sure that
they are in split-screen mode. Absent a new API for them
to query, simply making sure they can see the divider seems
like the simplest way to provide this.

Bug: 28768841
Test: A11y service CTS
Change-Id: I92b89c842689e4c4c69a732490150ca032de46cc

6 years agoAAPT2: Sort artifacts based on the Play Store rules.
Shane Farmer [Mon, 4 Dec 2017 17:08:38 +0000 (09:08 -0800)]
AAPT2: Sort artifacts based on the Play Store rules.

Sort output artifacts so that the updated versionCode manifest entry
will allow correct handling of updates from Play Store. The most
important dimension is Android SDK version. It is important that a split
based on min SDK version will allow a user to get a new APK if they
upgrade the OS on their device to support a new split.

ABI splits need to also be taken into consideration as it is possible
for a device to run in ARM emulation mode and installing an ARM APK over
a x86 APK could cause performance regressions.

The XML file format was updated to give each of the configuration groups
have their own section of the XML file. This allows the sort order to be
determined by a groups ordering. Artifacts can now be added to the
configuration file in an arbitrary order. Since this will be the common
case for developers, it will help reduce errors from inserting a new
artifact in the wrong spot.

The implementation follows the rules outlined at:
https://developer.android.com/google/play/publishing/multiple-apks.html

Test: Unit tests
Test: Manual process XML configuration

Change-Id: I0face862c6d6b9d3cd2d99088afe5b9491be0120

6 years agoAAPT2: Allow empty group definitions
Shane Farmer [Mon, 18 Dec 2017 22:44:11 +0000 (14:44 -0800)]
AAPT2: Allow empty group definitions

With ABI, screen density, and locale, it is possible to use a shorthand
notation when the group only has a single entry. The shorthand is to
leave the group empty and use a valid configuration for the group name.

Test: manually ran optimize command
Test: unit tests

Change-Id: If2d091e587474847c6c9e9be1a29196b261cc82d

6 years agoAAPT2: Get list of multi-APK artifacts without APK file
Shane Farmer [Sat, 16 Dec 2017 00:55:54 +0000 (16:55 -0800)]
AAPT2: Get list of multi-APK artifacts without APK file

Allow the optimize command to produce a list of output artifact names
without needing to read the input APK from disk. This not only saves
disk reads for a file that will not be used, it also allows the list
of outputs to be generated without having an APK file yet.

Test: unit tests
Test: split an APK
Test: print list of outputs without an APK
Change-Id: I4e18e63f298a07f26ab0de2b2f0acb769bb535ba

6 years agoCherrypick from from oc-mr1-dev doc: Fixing Javadoc formatting.
Andrew Solovay [Tue, 19 Dec 2017 01:23:35 +0000 (17:23 -0800)]
Cherrypick from from oc-mr1-dev doc: Fixing Javadoc formatting.
Original-Change-Id: I5ee04bb96234441c5740665540b5e803fcf9710f

No code changes, just fixing typos in the doc comments.

Doc is staged to:

http://go/dac-stage/reference/android/service/autofill/AutofillService.html
http://go/dac-stage/reference/android/service/autofill/FillRequest.html

Test: make ds-docs
Bug: 70812346
Change-Id: Ia76121c60197275c6be1717c8003fe1c4baf5f97

6 years agoDon't include mockito in frameworks-base-testutils
Philip P. Moltmann [Tue, 19 Dec 2017 21:20:22 +0000 (13:20 -0800)]
Don't include mockito in frameworks-base-testutils

So that each test can pick if they want mockito-inline or not.

Test: m -j checkbuild
Change-Id: I1ac02acebbe5cd01f3032a10932a1c612d8d3a4d
Merged-In: I1ac02acebbe5cd01f3032a10932a1c612d8d3a4d

6 years agoAnnotate an assortment of coretest with @LargeTest
Aurimas Liutikas [Tue, 19 Dec 2017 21:21:10 +0000 (13:21 -0800)]
Annotate an assortment of coretest with @LargeTest

Non-annotated tests do not run, thus adding @LargeTest to an assortment
of tests that were missing annotations.

Found these classes with:
fn "*Test.java" | xargs grep -L "@LargeTest" | xargs grep -L "@MediumTest" | \
    xargs grep -L "@SmallTest" | sort

Bug: 70846562
Test: make -j80 FrameworksCoreTests
Change-Id: Ifd466251b92728f9bbfa3cbd8fd21d34490f4eb1

6 years agoDon't include mockito in frameworks-base-testutils
Philip P. Moltmann [Tue, 19 Dec 2017 21:20:22 +0000 (13:20 -0800)]
Don't include mockito in frameworks-base-testutils

So that each test can pick if they want mockito-inline or not.

Test: m -j checkbuild
Change-Id: I1ac02acebbe5cd01f3032a10932a1c612d8d3a4d