OSDN Git Service

android-x86/frameworks-base.git
6 years agoRenamed KeyFallbackEvent to UnhandledKeyEvent and exposed dispatch
Evan Rosky [Thu, 22 Mar 2018 23:04:15 +0000 (16:04 -0700)]
Renamed KeyFallbackEvent to UnhandledKeyEvent and exposed dispatch

This new naming clashes less with the existing notion of FLAG_FALLBACK
in KeyEvents.

Bug: 72562800
Test: ViewTest#testUnhandledKeys
Change-Id: Ibd713860601e62d955443fe6811fd974b5bb0092

6 years agoMerge "Fix string description" into pi-dev
TreeHugger Robot [Mon, 26 Mar 2018 22:24:26 +0000 (22:24 +0000)]
Merge "Fix string description" into pi-dev

6 years agoMerge "Security fixup for Slices" into pi-dev
Jason Monk [Mon, 26 Mar 2018 21:44:38 +0000 (21:44 +0000)]
Merge "Security fixup for Slices" into pi-dev

6 years agoMerge "Sticky battery saver" into pi-dev
TreeHugger Robot [Mon, 26 Mar 2018 21:41:09 +0000 (21:41 +0000)]
Merge "Sticky battery saver" into pi-dev

6 years agoMerge "Modify LocationAccessPolicy to use LocationManager" into pi-dev
Hall Liu [Mon, 26 Mar 2018 20:59:58 +0000 (20:59 +0000)]
Merge "Modify LocationAccessPolicy to use LocationManager" into pi-dev

6 years agoMerge "Remove incorrect @NonNull annotations on getDrawable() and variants." into...
Chris Craik [Mon, 26 Mar 2018 20:21:04 +0000 (20:21 +0000)]
Merge "Remove incorrect @NonNull annotations on getDrawable() and variants." into pi-dev

6 years agoMerge "Add missing null check" into pi-dev
Svetoslav Ganov [Mon, 26 Mar 2018 20:18:45 +0000 (20:18 +0000)]
Merge "Add missing null check" into pi-dev

6 years agoMerge "Refactoring GlobalSettingsProto to avoid method limit." into pi-dev
TreeHugger Robot [Mon, 26 Mar 2018 20:11:09 +0000 (20:11 +0000)]
Merge "Refactoring GlobalSettingsProto to avoid method limit." into pi-dev

6 years agoMerge "Fix setServerParams to not always set snapshot pending" into pi-dev
Robert Berry [Mon, 26 Mar 2018 19:18:52 +0000 (19:18 +0000)]
Merge "Fix setServerParams to not always set snapshot pending" into pi-dev

6 years agoMerge "Translating the icon in the shelf with the notification" into pi-dev
TreeHugger Robot [Mon, 26 Mar 2018 19:14:36 +0000 (19:14 +0000)]
Merge "Translating the icon in the shelf with the notification" into pi-dev

6 years agoSticky battery saver
Makoto Onuki [Mon, 19 Mar 2018 21:47:05 +0000 (14:47 -0700)]
Sticky battery saver

- When battery saver is enabled manually (i.e. via PM.setPowerSaveMode()),
it'll stick, and we'll re-enable battery saver even after a reboot
or a charge.

- Extracted all battery saver state transition logic into a separate
class.

Fix: 75033216
Bug: 74120126
Test: Manual test with "dumpsys battery set ...."
Test: atest $ANDROID_BUILD_TOP/frameworks/base/services/tests/servicestests/src/com/android/server/power/batterysaver/BatterySaverStateMachineTest.java
Change-Id: If020cd48f341b339783fe09dd35bc7199e737a52
Test: dumpsys power
Test: incident_report power
Test: atest CtsBatterySavingTestCases

6 years agoMerge "Logging: Bluetooth Enabled" into pi-dev
Tej Singh [Mon, 26 Mar 2018 17:27:52 +0000 (17:27 +0000)]
Merge "Logging: Bluetooth Enabled" into pi-dev

6 years agoMerge "Get application info in the correct user id" into pi-dev
Tony Mak [Mon, 26 Mar 2018 17:04:47 +0000 (17:04 +0000)]
Merge "Get application info in the correct user id" into pi-dev

6 years agoMerge "Improve ConnectivityManager.getNetworkWatchlistConfigHash() javadoc" into...
Ricky Wai [Mon, 26 Mar 2018 16:46:20 +0000 (16:46 +0000)]
Merge "Improve ConnectivityManager.getNetworkWatchlistConfigHash() javadoc" into pi-dev

6 years agoMerge "add airplane mode shell commands to connectivity" into pi-dev
Michael West [Mon, 26 Mar 2018 16:38:03 +0000 (16:38 +0000)]
Merge "add airplane mode shell commands to connectivity" into pi-dev

6 years agoMerge "Shorter bucket elevation for system_interaction and sync_adapter" into pi-dev
Amith Yamasani [Mon, 26 Mar 2018 16:17:33 +0000 (16:17 +0000)]
Merge "Shorter bucket elevation for system_interaction and sync_adapter" into pi-dev

6 years agoMerge "AudioSystem: Add case for FOR_VIBRATE_RINGING in forceUseUsageToString" into...
TreeHugger Robot [Mon, 26 Mar 2018 16:06:22 +0000 (16:06 +0000)]
Merge "AudioSystem: Add case for FOR_VIBRATE_RINGING in forceUseUsageToString" into pi-dev

6 years agoMerge "Clear identity when asking for other users." into pi-dev
TreeHugger Robot [Mon, 26 Mar 2018 15:06:28 +0000 (15:06 +0000)]
Merge "Clear identity when asking for other users." into pi-dev

6 years agoMerge changes from topic "cleanup-ble-app-list-at-death" into pi-dev
TreeHugger Robot [Mon, 26 Mar 2018 15:03:19 +0000 (15:03 +0000)]
Merge changes from topic "cleanup-ble-app-list-at-death" into pi-dev

* changes:
  Calls unlinkToDeath in binderDied to deregister
  Remove BLE App entry from mBleApps list when App died

6 years agoMerge "Consolidate logic for 'recent notifications'" into pi-dev
Julia Reynolds [Mon, 26 Mar 2018 14:36:07 +0000 (14:36 +0000)]
Merge "Consolidate logic for 'recent notifications'" into pi-dev

6 years agoMerge "Add Osu2.apk to the AndroidTest so the tests have a target" into pi-dev
Julien Desprez [Mon, 26 Mar 2018 13:45:45 +0000 (13:45 +0000)]
Merge "Add Osu2.apk to the AndroidTest so the tests have a target" into pi-dev

6 years agoMerge changes from topic "executor_api" into pi-dev
TreeHugger Robot [Mon, 26 Mar 2018 13:31:30 +0000 (13:31 +0000)]
Merge changes from topic "executor_api" into pi-dev

* changes:
  Camera: Accept user-supplied executors in capture sessions
  Camera: Async camera manager calls should use executors

6 years agoMerge "Tweaks to wireless charging animation" into pi-dev
Beverly Tai [Mon, 26 Mar 2018 13:22:07 +0000 (13:22 +0000)]
Merge "Tweaks to wireless charging animation" into pi-dev

6 years agoGet application info in the correct user id
Tony Mak [Mon, 26 Mar 2018 11:38:04 +0000 (12:38 +0100)]
Get application info in the correct user id

Fixes: 76396560

Test: Create work profile and launch hangouts in work profile.
Change-Id: Ic3727ac899153b6a96dd9b6d6921c32ba0bbd93e

6 years agoMerge "MediaSession2: Change return type of CommandGroup#getCommands()" into pi-dev
Jaewan Kim [Mon, 26 Mar 2018 10:55:30 +0000 (10:55 +0000)]
Merge "MediaSession2: Change return type of CommandGroup#getCommands()" into pi-dev

6 years agoMerge "MediaMetadata2: Remove radio constants" into pi-dev
Jaewan Kim [Mon, 26 Mar 2018 10:53:24 +0000 (10:53 +0000)]
Merge "MediaMetadata2: Remove radio constants" into pi-dev

6 years agoMerge "MediaSession2: Revisit command code" into pi-dev
Jaewan Kim [Mon, 26 Mar 2018 10:52:22 +0000 (10:52 +0000)]
Merge "MediaSession2: Revisit command code" into pi-dev

6 years agoMerge "Add more hidden API uses to light greylist" into pi-dev
TreeHugger Robot [Mon, 26 Mar 2018 10:49:21 +0000 (10:49 +0000)]
Merge "Add more hidden API uses to light greylist" into pi-dev

6 years agoFix setServerParams to not always set snapshot pending
Robert Berry [Mon, 26 Mar 2018 10:36:40 +0000 (11:36 +0100)]
Fix setServerParams to not always set snapshot pending

Only updates should set snapshot pending. Setting the server params for
the first time should not set snapshot pending. If it did, then just
initializing the recovery agent would cause a snapshot to be made, even
if it contained no keys. Also, setting the snapshot to the same value as
it was previously should not set snapshot pending, for the exact same
reason. If the server params were to change, however, for some reason,
then a new snapshot must be made, so that it can be synced to the correct
vault.

Bug: 74949975
Test: runtest frameworks-services -p \
      com.android.server.locksettings.recoverablekeystore

Change-Id: Ie09284553f922de869be7bcd577d0f0eb9d0bbd3

6 years agoMerge "Expose hidden API to check whether a given package is state protected" into...
Benjamin Franz [Mon, 26 Mar 2018 09:15:41 +0000 (09:15 +0000)]
Merge "Expose hidden API to check whether a given package is state protected" into pi-dev

6 years agoAdd more hidden API uses to light greylist
David Brazdil [Mon, 26 Mar 2018 09:03:46 +0000 (10:03 +0100)]
Add more hidden API uses to light greylist

From bug reports.

Bug: 64382372
Bug: 76350169
Bug: 76329535
Bug: 76329536
Bug: 76355229
Bug: 76350172
Bug: 76384058
Bug: 76350170
Test: make
Change-Id: Id5f99235d0abc1a8326ed254dd835c9ac05dc996

6 years agoMerge "MediaSession2: Add CommandGroup#add/removeCommand(int)" into pi-dev
Jaewan Kim [Mon, 26 Mar 2018 08:10:44 +0000 (08:10 +0000)]
Merge "MediaSession2: Add CommandGroup#add/removeCommand(int)" into pi-dev

6 years agoMediaSession2: Add CommandGroup#add/removeCommand(int)
Jaewan Kim [Tue, 20 Mar 2018 07:19:07 +0000 (16:19 +0900)]
MediaSession2: Add CommandGroup#add/removeCommand(int)

Bug: 74648408
Test: Build
Change-Id: Icfcde5946e75ad74c2123be8064eb365366f5960

6 years agoMediaMetadata2: Remove radio constants
Jaewan Kim [Mon, 26 Mar 2018 05:13:37 +0000 (14:13 +0900)]
MediaMetadata2: Remove radio constants

Removeing radio constants until their names are finalized.

Bug: 75500592
Test: Build
Change-Id: I6f7a219c19dd24579a76c2064e9781ca53618c69

6 years agoMerge "Greylist camera API used by CameraITS test" into pi-dev
Nicolas Geoffray [Mon, 26 Mar 2018 07:58:43 +0000 (07:58 +0000)]
Merge "Greylist camera API used by CameraITS test" into pi-dev

6 years agoMerge "Add APIs to light grey." into pi-dev
Nicolas Geoffray [Mon, 26 Mar 2018 07:53:38 +0000 (07:53 +0000)]
Merge "Add APIs to light grey." into pi-dev

6 years agoMediaSession2: Change return type of CommandGroup#getCommands()
Jaewan Kim [Tue, 20 Mar 2018 07:11:40 +0000 (16:11 +0900)]
MediaSession2: Change return type of CommandGroup#getCommands()

Bug: 74648408
Test: Build
Change-Id: I443dd0a1f244b285754561a4c485ef2e8530d42d

6 years agoMediaSession2: Revisit command code
Jaewan Kim [Tue, 20 Mar 2018 08:06:01 +0000 (17:06 +0900)]
MediaSession2: Revisit command code

Bug: 74648408
Test: Build
Change-Id: I0c66d6dec7f5a25bd4c36aa6e2c140951ea38855

6 years agoMerge "MediaSession2: Match APIs with MediaPlayerBase" into pi-dev
Jaewan Kim [Mon, 26 Mar 2018 05:12:17 +0000 (05:12 +0000)]
Merge "MediaSession2: Match APIs with MediaPlayerBase" into pi-dev

6 years agoMerge "MediaPlayerBase: Add PlayerEventCallback#onPlaybackSpeedChanged()" into pi-dev
Jaewan Kim [Mon, 26 Mar 2018 04:57:48 +0000 (04:57 +0000)]
Merge "MediaPlayerBase: Add PlayerEventCallback#onPlaybackSpeedChanged()" into pi-dev

6 years agoShorter bucket elevation for system_interaction and sync_adapter
Amith Yamasani [Mon, 26 Mar 2018 04:55:50 +0000 (21:55 -0700)]
Shorter bucket elevation for system_interaction and sync_adapter

Don't keep the app in ACTIVE for too long after an indirect
use of the app. Also don't mark as used, so bucketing algorithm
can override quickly.

Bug: 74340258
Test: atest AppStandbyControllerTests
Change-Id: I3b8014873aaf881de07304b64039da211a63a525

6 years agoClear identity when asking for other users.
Jeff Sharkey [Mon, 26 Mar 2018 04:53:29 +0000 (22:53 -0600)]
Clear identity when asking for other users.

Bug: 76394640
Test: nope
Change-Id: I8d1530ed01669947e91725e905240729e31c7234

6 years agoMerge "Remove unimplemented RecoverableKeystoreManager APIs." into pi-dev
Dmitry Dementyev [Mon, 26 Mar 2018 02:18:33 +0000 (02:18 +0000)]
Merge "Remove unimplemented RecoverableKeystoreManager APIs." into pi-dev

6 years agoMerge "MediaController2: Match APIs with MediaPlayerBase" into pi-dev
Jaewan Kim [Mon, 26 Mar 2018 02:07:57 +0000 (02:07 +0000)]
Merge "MediaController2: Match APIs with MediaPlayerBase" into pi-dev

6 years agoMerge "MediaPlaylistAgent: Add getMediaItem()" into pi-dev
Jaewan Kim [Mon, 26 Mar 2018 01:31:54 +0000 (01:31 +0000)]
Merge "MediaPlaylistAgent: Add getMediaItem()" into pi-dev

6 years agoMerge "MediaController2: Remove MediaPlaylistAgent in the ControllerCallback" into...
Jaewan Kim [Mon, 26 Mar 2018 01:24:21 +0000 (01:24 +0000)]
Merge "MediaController2: Remove MediaPlaylistAgent in the ControllerCallback" into pi-dev

6 years agoMerge "Add UX string tweaks before string freeze." into pi-dev
Jeff Sharkey [Sun, 25 Mar 2018 22:05:45 +0000 (22:05 +0000)]
Merge "Add UX string tweaks before string freeze." into pi-dev

6 years agoMerge "Notify all affected UIDs for user/audio restriction changes" into pi-dev
Svetoslav Ganov [Sun, 25 Mar 2018 16:32:54 +0000 (16:32 +0000)]
Merge "Notify all affected UIDs for user/audio restriction changes" into pi-dev

6 years agoAdd UX string tweaks before string freeze.
Jeff Sharkey [Sun, 25 Mar 2018 09:08:20 +0000 (03:08 -0600)]
Add UX string tweaks before string freeze.

Test: builds, boots
Bug: 76097999
Change-Id: I85e82a039d0b3b857257a3143a7b94de67ccada2

6 years agoMerge "Guarding collisions in TimeSparseArray" into pi-dev
TreeHugger Robot [Sat, 24 Mar 2018 22:36:21 +0000 (22:36 +0000)]
Merge "Guarding collisions in TimeSparseArray" into pi-dev

6 years agoMerge "Fix BoringLayout with PrecomputedText" into pi-dev
TreeHugger Robot [Sat, 24 Mar 2018 21:03:31 +0000 (21:03 +0000)]
Merge "Fix BoringLayout with PrecomputedText" into pi-dev

6 years agoMerge "Fix StatsCompanionService sometimes can be null" into pi-dev
TreeHugger Robot [Sat, 24 Mar 2018 16:28:01 +0000 (16:28 +0000)]
Merge "Fix StatsCompanionService sometimes can be null" into pi-dev

6 years agoMerge "Pass all relevant resolver info to netd" into pi-dev
TreeHugger Robot [Sat, 24 Mar 2018 15:58:42 +0000 (15:58 +0000)]
Merge "Pass all relevant resolver info to netd" into pi-dev

6 years agoAudioSystem: Add case for FOR_VIBRATE_RINGING in forceUseUsageToString
Jack He [Sat, 24 Mar 2018 07:21:16 +0000 (00:21 -0700)]
AudioSystem: Add case for FOR_VIBRATE_RINGING in forceUseUsageToString

Bug: 72647074
Test: make, dumpsys audio
Change-Id: Ieaf2bf0e0ef6624409d1e91d9a1d232726460fc7

6 years agoAdd missing null check
Svet Ganov [Sat, 24 Mar 2018 07:04:38 +0000 (00:04 -0700)]
Add missing null check

Test: manual

Bug: 72442137

Change-Id: Id0dc9b7f624a9ee0061fc735ed0a2f2aefd8a954

6 years agoMerge "Add new trace tag for AIDL." into pi-dev
Martijn Coenen [Sat, 24 Mar 2018 05:58:25 +0000 (05:58 +0000)]
Merge "Add new trace tag for AIDL." into pi-dev

6 years agoMerge "Don't warn finishing ops for gone packages" into pi-dev
TreeHugger Robot [Sat, 24 Mar 2018 05:51:16 +0000 (05:51 +0000)]
Merge "Don't warn finishing ops for gone packages" into pi-dev

6 years agoMerge "Add strings needed for additional labels of wifi summary" into pi-dev
TreeHugger Robot [Sat, 24 Mar 2018 05:22:28 +0000 (05:22 +0000)]
Merge "Add strings needed for additional labels of wifi summary" into pi-dev

6 years agoMerge changes from topic "data-service-grant-policy" into pi-dev
Nathan Harold [Sat, 24 Mar 2018 05:00:42 +0000 (05:00 +0000)]
Merge changes from topic "data-service-grant-policy" into pi-dev

* changes:
  Add Permissions Grant for TelephonyDataService
  Add a Method to Revoke DefaultGrant Permissions

6 years agoPass all relevant resolver info to netd
Erik Kline [Sun, 4 Mar 2018 12:01:01 +0000 (21:01 +0900)]
Pass all relevant resolver info to netd

Test: runtest frameworks-net passes
Test: manual testing of opportunistic and strict mode works
Bug: 34953048
Bug: 64133961
Bug: 72345192
Merged-In: I96f7747b8f0bb38d95579b688b4c2d068f1229cf
Merged-In: Ia4d896c4cc33c02f0c46d5d4c760cc33b13dff0b
Change-Id: Ia4f1905e1fa60e7a468c2246fb809191d2ba796b
(cherry picked from commit e5dac904d361a349f1cfc48500a678d22e3a7316)

6 years agoMerge "DO NOT MERGE Clean up SettingsLib dependencies" into pi-dev
TreeHugger Robot [Sat, 24 Mar 2018 04:39:20 +0000 (04:39 +0000)]
Merge "DO NOT MERGE Clean up SettingsLib dependencies" into pi-dev

6 years agoMerge "Add new strings for Hearing Aid profile" into pi-dev
Stanley Tng [Sat, 24 Mar 2018 04:11:57 +0000 (04:11 +0000)]
Merge "Add new strings for Hearing Aid profile" into pi-dev

6 years agoMerge "Add missing @NonNull annotation to AndroidKeyStoreProvider method." into pi-dev
Dmitry Dementyev [Sat, 24 Mar 2018 03:59:27 +0000 (03:59 +0000)]
Merge "Add missing @NonNull annotation to AndroidKeyStoreProvider method." into pi-dev

6 years agoMerge "Add more NonNull annotations to RecoveryController API" into pi-dev
Dmitry Dementyev [Sat, 24 Mar 2018 03:48:12 +0000 (03:48 +0000)]
Merge "Add more NonNull annotations to RecoveryController API" into pi-dev

6 years agoMerge "Add a string message for Private DNS strict mode failure" into pi-dev
Erik Kline [Sat, 24 Mar 2018 03:30:30 +0000 (03:30 +0000)]
Merge "Add a string message for Private DNS strict mode failure" into pi-dev

6 years agoMerge "Add accessibility string for FingerprintDialog(impl) authenticated" into pi-dev
Kevin Chyn [Sat, 24 Mar 2018 03:21:24 +0000 (03:21 +0000)]
Merge "Add accessibility string for FingerprintDialog(impl) authenticated" into pi-dev

6 years agoTranslating the icon in the shelf with the notification
Selim Cinek [Sat, 24 Mar 2018 03:04:32 +0000 (20:04 -0700)]
Translating the icon in the shelf with the notification

It's possible that the icon is transitioning when a
notification is being swiped. We now translate
the icon with it.

Change-Id: I8d533b8402a934d108f57a22d2975b20774eff8e
Fixes: 72948017
Test: runtest systemui

6 years agoNotify all affected UIDs for user/audio restriction changes
Svet Ganov [Sat, 24 Mar 2018 00:44:30 +0000 (17:44 -0700)]
Notify all affected UIDs for user/audio restriction changes

Test: pass: adb shell am instrument -w com.android.frameworks.servicestests
                /android.support.test.runner.AndroidJUnitRunner
      pass: cts-tradefed run cts-dev -m CtsPermissionTestCases
                -t android.permission.cts.AppOpsTest

Bug: 75274546

Change-Id: I788823fcc3ade8a4cf752d64bd11b87b212e4d31

6 years agoMerge "PlayerBase: log when startWatching fails" into pi-dev
TreeHugger Robot [Sat, 24 Mar 2018 02:14:38 +0000 (02:14 +0000)]
Merge "PlayerBase: log when startWatching fails" into pi-dev

6 years agoMerge "[QS] Update string name in prep for freeze" into pi-dev
TreeHugger Robot [Sat, 24 Mar 2018 02:01:17 +0000 (02:01 +0000)]
Merge "[QS] Update string name in prep for freeze" into pi-dev

6 years agoadd airplane mode shell commands to connectivity
mswest46 [Mon, 12 Mar 2018 17:34:34 +0000 (10:34 -0700)]
add airplane mode shell commands to connectivity

Fixes: 74410990
Test: Manually checked that commands enable/disable airplane mode.

Change-Id: I942bd4679fcd498a39b9b2cab68e8d3c00ce62d3

6 years agoAdd accessibility string for FingerprintDialog(impl) authenticated
Kevin Chyn [Sat, 24 Mar 2018 01:12:19 +0000 (18:12 -0700)]
Add accessibility string for FingerprintDialog(impl) authenticated

Bug: 74456537

Test: builds
Change-Id: I1edb54334bf5e148bac6c9e1583c6fd36bd9095a

6 years agoMerge "Add missing computeOpacity call" into pi-dev
TreeHugger Robot [Sat, 24 Mar 2018 01:22:15 +0000 (01:22 +0000)]
Merge "Add missing computeOpacity call" into pi-dev

6 years agoMerge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Sat, 24 Mar 2018 01:21:28 +0000 (01:21 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev

6 years agoMerge "JobStore: persist unwanted set of capabilities" into pi-dev
TreeHugger Robot [Sat, 24 Mar 2018 01:19:20 +0000 (01:19 +0000)]
Merge "JobStore: persist unwanted set of capabilities" into pi-dev

6 years agoFix BoringLayout with PrecomputedText
Seigo Nonaka [Sat, 24 Mar 2018 00:22:54 +0000 (17:22 -0700)]
Fix BoringLayout with PrecomputedText

The special logic for PrecomputedText in BoringLayout has problem.
The special logic is no longer necessary since TextLine is now aware of
PrecomputedText. So, just removing special logic from BoringLayout.

On the other hand, the metrics parameters check in TextLine has removed
Ie73bce52c6c673cda58973ddad04627a7cf2e5e9, but that was wrong. TextLine
can be used by BoringLayout too. Thus, need to reject PrecomputedText
if the given TextPaint is not compatible with given param.

Bug: 76227465
Test: atest CtsWidgetTestCases:EditTextTest
    CtsWidgetTestCases:TextViewFadingEdgeTest
    FrameworksCoreTests:TextViewFallbackLineSpacingTest
    FrameworksCoreTests:TextViewTest FrameworksCoreTests:TypefaceTest
    CtsGraphicsTestCases:TypefaceTest CtsWidgetTestCases:TextViewTest
    CtsTextTestCases FrameworksCoreTests:android.text
    CtsWidgetTestCases:TextViewPrecomputedTextTest

Change-Id: I172b5f655402e797b53b9667b49cb4ab89ec0dc0

6 years agoMerge "Unhide ImsReasonInfo Constructor" into pi-dev
TreeHugger Robot [Sat, 24 Mar 2018 01:12:49 +0000 (01:12 +0000)]
Merge "Unhide ImsReasonInfo Constructor" into pi-dev

6 years agoMerge "Make Assistant stack invisible behind split-screen stacks." into pi-dev
Wale Ogunwale [Sat, 24 Mar 2018 01:06:06 +0000 (01:06 +0000)]
Merge "Make Assistant stack invisible behind split-screen stacks." into pi-dev

6 years agoAdd new strings for Hearing Aid profile
Stanley Tng [Fri, 23 Mar 2018 23:03:28 +0000 (16:03 -0700)]
Add new strings for Hearing Aid profile

These new strings will be used by the Settings App for the hearing aid
profile.

Test: compiled.
Bug: 74204427
Change-Id: Ia5e07c094f3b7917176e10b920eee7ab9eda3d2f

6 years agoRefactoring GlobalSettingsProto to avoid method limit.
Kweku Adams [Sat, 24 Mar 2018 01:03:43 +0000 (18:03 -0700)]
Refactoring GlobalSettingsProto to avoid method limit.

This is a large CL, so I'll do the other two protos in separate CLs.

Bug: 76011704
Bug: 74975371
Test: flash device and check incident.proto output
Change-Id: I285e6495b122c36eded9f6fc3afa39c92c293ed5
also: m EMMA_INSTRUMENT_STATIC=true EMMA_INSTRUMENT=true out/target/common/obj/APPS/CtsStatsdApp_intermediates/jacoco/work/instrumented/updated.stamp
also: atest CtsIncidentHostTestCases:com.android.server.cts.SettingsIncidentTest

6 years agoGuarding collisions in TimeSparseArray
Suprabh Shukla [Fri, 23 Mar 2018 21:20:17 +0000 (14:20 -0700)]
Guarding collisions in TimeSparseArray

TimeSparseArray - used to store UsageEvents - can keep at most one event
per millisecond, which can result in an event being replaced by another
event that occurred close enough that the system records it at the same
millisecond.

Test: atest android.app.usage.TimeSparseArrayTest

Fixes: 73832306
Change-Id: I860a101ab098f65d5c5832758832f43572865690

6 years agoAdd missing @NonNull annotation to AndroidKeyStoreProvider method.
Dmitry Dementyev [Sat, 24 Mar 2018 00:46:52 +0000 (17:46 -0700)]
Add missing @NonNull annotation to AndroidKeyStoreProvider method.

Bug: 73959762
Test: none
Change-Id: I2298c8fe0893032f374629a5af128474ba0f679c

6 years agoAdd more NonNull annotations to RecoveryController API
Dmitry Dementyev [Sat, 24 Mar 2018 00:36:58 +0000 (17:36 -0700)]
Add more NonNull annotations to RecoveryController API

Bug: 73959762
Test: none
Change-Id: I648c20a099d4ac1c002f4f467d7189a8bc019560

6 years agoMerge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Sat, 24 Mar 2018 00:29:04 +0000 (00:29 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev

6 years agoMerge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Sat, 24 Mar 2018 00:28:32 +0000 (00:28 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev

6 years agoDO NOT MERGE Clean up SettingsLib dependencies
Alan Viverette [Wed, 21 Mar 2018 19:07:32 +0000 (15:07 -0400)]
DO NOT MERGE Clean up SettingsLib dependencies

v14-preferences is an empty lib and libraries cannot directly
reference other libraries' R classes due to a bug in Make builds

Bug: 73250914
Bug: 74248169
Test: make && make checkbuild
Change-Id: Id156b2a2140cabc98b58b5312ea28da42f4ca63b

6 years agoMerge "Add NonNull annotation to more parameters in Recovery Controller." into pi-dev
Dmitry Dementyev [Sat, 24 Mar 2018 00:10:30 +0000 (00:10 +0000)]
Merge "Add NonNull annotation to more parameters in Recovery Controller." into pi-dev

6 years agoMerge "Revert "Use transaction for local activity relaunch"" into pi-dev
Andrii Kulian [Fri, 23 Mar 2018 23:36:02 +0000 (23:36 +0000)]
Merge "Revert "Use transaction for local activity relaunch"" into pi-dev

6 years agoMerge "Don't show unsupported sdk warning in test harness." into pi-dev
Wale Ogunwale [Fri, 23 Mar 2018 23:32:54 +0000 (23:32 +0000)]
Merge "Don't show unsupported sdk warning in test harness." into pi-dev

6 years agoRemove unimplemented RecoverableKeystoreManager APIs.
Dmitry Dementyev [Fri, 23 Mar 2018 22:18:33 +0000 (15:18 -0700)]
Remove unimplemented RecoverableKeystoreManager APIs.

Add some Nullable annotations.

Bug: 75952916,74859770
Test: apct
Change-Id: I25710263a1ba806d49ec11638dab00f3513631a8

6 years agoMerge "Remove quick switch and simplify quickstep code for scrub" into pi-dev
TreeHugger Robot [Fri, 23 Mar 2018 23:28:17 +0000 (23:28 +0000)]
Merge "Remove quick switch and simplify quickstep code for scrub" into pi-dev

6 years agoMerge "Fix SurfaceView Background" into pi-dev
TreeHugger Robot [Fri, 23 Mar 2018 23:21:04 +0000 (23:21 +0000)]
Merge "Fix SurfaceView Background" into pi-dev

6 years agoMerge "Parse SMS locally upon error to get message ref" into pi-dev
Brad Ebinger [Fri, 23 Mar 2018 23:19:26 +0000 (23:19 +0000)]
Merge "Parse SMS locally upon error to get message ref" into pi-dev

6 years agoFix string description
Mady Mellor [Fri, 23 Mar 2018 23:19:02 +0000 (16:19 -0700)]
Fix string description

Test: make
Bug: 34840333
Change-Id: Iea11f92e143f5fe84444d86c865eec54518ccc00

6 years agoMerge "Fixed AutofillServiceHelper.assertValid() so it throws the right exception...
TreeHugger Robot [Fri, 23 Mar 2018 23:18:27 +0000 (23:18 +0000)]
Merge "Fixed AutofillServiceHelper.assertValid() so it throws the right exception." into pi-dev

6 years agoMerge "Notify all running users for global settings change" into pi-dev
TreeHugger Robot [Fri, 23 Mar 2018 23:17:21 +0000 (23:17 +0000)]
Merge "Notify all running users for global settings change" into pi-dev

6 years agoMerge "Split the DownloadStateCallback class into two" into pi-dev
Hall Liu [Fri, 23 Mar 2018 23:11:46 +0000 (23:11 +0000)]
Merge "Split the DownloadStateCallback class into two" into pi-dev

6 years agoMerge "Add string for 'snooze' action to use in local context menu" into pi-dev
TreeHugger Robot [Fri, 23 Mar 2018 23:11:30 +0000 (23:11 +0000)]
Merge "Add string for 'snooze' action to use in local context menu" into pi-dev

6 years agoAdd a string message for Private DNS strict mode failure
Erik Kline [Thu, 22 Mar 2018 19:58:25 +0000 (12:58 -0700)]
Add a string message for Private DNS strict mode failure

Add a message to be displayed whenever a Private DNS provider
hostname is unusable.  It might be that the name fails to resolve
or that network errors prevent us from connecting -- the string
need give no indication of the specific failure mode, only its
unusability.

Test: treehugger
Bug: 64133961
Bug: 74844869
Change-Id: I361291229241854dc3b9b84407baf500e84a1832

6 years agoMerge "Revert the low battery warning title to previous version." into pi-dev
TreeHugger Robot [Fri, 23 Mar 2018 22:57:34 +0000 (22:57 +0000)]
Merge "Revert the low battery warning title to previous version." into pi-dev