OSDN Git Service

android-x86/frameworks-base.git
6 years agoconfig.xml: Add configuration to enable/disable ACS
Roshan Pius [Wed, 17 Jan 2018 23:28:25 +0000 (15:28 -0800)]
config.xml: Add configuration to enable/disable ACS

Bug: 69065316
Test: Compiles
Change-Id: I390523b0879f5ec71806abdd39dddeb15dfc5940

6 years agoWifiConfiguration: Add support for auto-selecting AP band
Roshan Pius [Fri, 12 Jan 2018 00:52:14 +0000 (16:52 -0800)]
WifiConfiguration: Add support for auto-selecting AP band

Add new constant indicating the band/channel for SoftAp operation will
be determined during softap initialization.

The term 'ANY' for this option to be consistent with terminology used
in hostapd.

Bug: 68763822
Test: Compiles
Change-Id: I9676caf5188601ca16c9229aaa8be2d0e43404a6

6 years agoMerge "Add time until Night Light is on/off as secondary label"
TreeHugger Robot [Thu, 18 Jan 2018 21:58:38 +0000 (21:58 +0000)]
Merge "Add time until Night Light is on/off as secondary label"

6 years agoMerge "Move a shared pointer that's going to die anyway."
TreeHugger Robot [Thu, 18 Jan 2018 21:58:06 +0000 (21:58 +0000)]
Merge "Move a shared pointer that's going to die anyway."

6 years agoMerge "Fix crash in EditText#getText"
TreeHugger Robot [Thu, 18 Jan 2018 21:30:13 +0000 (21:30 +0000)]
Merge "Fix crash in EditText#getText"

6 years agoMerge "Remove wifi_allow_scan_with_traffic"
Ningyuan Wang [Thu, 18 Jan 2018 21:20:51 +0000 (21:20 +0000)]
Merge "Remove wifi_allow_scan_with_traffic"

6 years agoMerge "Rename CrossProfileApps API as per API council feedback"
TreeHugger Robot [Thu, 18 Jan 2018 21:10:18 +0000 (21:10 +0000)]
Merge "Rename CrossProfileApps API as per API council feedback"

6 years agoRename CrossProfileApps API as per API council feedback
Tony Mak [Thu, 18 Jan 2018 12:49:49 +0000 (12:49 +0000)]
Rename CrossProfileApps API as per API council feedback

Three changes:
1. android.content.pm.crossprofile - > android.content.pm
2. getProfileSwitchingIcon -> getProfileSwitchingIconDrawable
3. startMainActivity “user” parameter should be named “targetUser”

Test: atest FrameworksServicesTests:com.android.server.pm.CrossProfileAppsServiceImplTest
Test: atest frameworks/base/core/tests/coretests/src/android/content/pm/CrossProfileAppsTest.java
Test: atest cts/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/CrossProfileAppsHostSideTest.java

FIXES: 71818128

Change-Id: Icf9a6d1f8b6808935ffd79b43185c7b12235f349

6 years agoMerge "Fixes dock side when rotating to seascape after drag to split"
TreeHugger Robot [Thu, 18 Jan 2018 20:36:41 +0000 (20:36 +0000)]
Merge "Fixes dock side when rotating to seascape after drag to split"

6 years agoMerge "Compute hyphenated word pieces in MeasuredText"
TreeHugger Robot [Thu, 18 Jan 2018 20:32:54 +0000 (20:32 +0000)]
Merge "Compute hyphenated word pieces in MeasuredText"

6 years agoMerge "Add StatsdStats in statsd's dumpsys"
Yao Chen [Thu, 18 Jan 2018 20:09:06 +0000 (20:09 +0000)]
Merge "Add StatsdStats in statsd's dumpsys"

6 years agoMerge "Rename RecoveryManager to RecoveryController"
Robert Berry [Thu, 18 Jan 2018 20:00:13 +0000 (20:00 +0000)]
Merge "Rename RecoveryManager to RecoveryController"

6 years agoMerge "Support installation of DexMetadata files (.dm)"
Calin Juravle [Thu, 18 Jan 2018 19:53:54 +0000 (19:53 +0000)]
Merge "Support installation of DexMetadata files (.dm)"

6 years agoMerge "Remove work profile off status bar icon"
TreeHugger Robot [Thu, 18 Jan 2018 19:53:26 +0000 (19:53 +0000)]
Merge "Remove work profile off status bar icon"

6 years agoMerge "Reinstate configs from disk across boots by fixing bugs"
Howard Ro [Thu, 18 Jan 2018 19:38:38 +0000 (19:38 +0000)]
Merge "Reinstate configs from disk across boots by fixing bugs"

6 years agoMove a shared pointer that's going to die anyway.
George Burgess IV [Thu, 18 Jan 2018 19:30:46 +0000 (11:30 -0800)]
Move a shared pointer that's going to die anyway.

This saves us two atomic operations that a copy would cost us (inc +
dec), and hopefully makes some internal tooling -- which yet doesn't
model atomics well -- happy.

Bug: None
Test: Builds
Change-Id: Ic55c3db6af55f45eceaf30c1ee479e9ae70aabb4

6 years agoMerge "Clarify usage of context in the JavaDoc"
Fyodor Kupolov [Thu, 18 Jan 2018 19:21:00 +0000 (19:21 +0000)]
Merge "Clarify usage of context in the JavaDoc"

6 years agoMerge "Prevent getting from transit when interesting window is exiting"
TreeHugger Robot [Thu, 18 Jan 2018 19:20:55 +0000 (19:20 +0000)]
Merge "Prevent getting from transit when interesting window is exiting"

6 years agoAdd time until Night Light is on/off as secondary label
Rohan Shah [Thu, 18 Jan 2018 17:54:20 +0000 (09:54 -0800)]
Add time until Night Light is on/off as secondary label

Added secondary label text for Night Light.

2 modes with 2 text options:
1) Twilight - until sunrise OR on at sunset
2) Custom - until <time> OR on at <time>

Test: Visually tested - tried all 4 variations + manual toggle + updates
Bug:69973398
Change-Id: I5d0d213b470608b7dfa9d6cce0c33be1365e10a0

6 years agoMerge changes Iaeb8d9c2,Ifa83ce1d
TreeHugger Robot [Thu, 18 Jan 2018 19:10:28 +0000 (19:10 +0000)]
Merge changes Iaeb8d9c2,Ifa83ce1d

* changes:
  Fix notification sorting.
  Remove all caps style

6 years agoMerge "AudioAttributes: note that AAudio.h should sync"
TreeHugger Robot [Thu, 18 Jan 2018 19:02:44 +0000 (19:02 +0000)]
Merge "AudioAttributes: note that AAudio.h should sync"

6 years agoMerge "Dump state of GnssMeasurement & NavMsg requests"
TreeHugger Robot [Thu, 18 Jan 2018 18:42:18 +0000 (18:42 +0000)]
Merge "Dump state of GnssMeasurement & NavMsg requests"

6 years agoMerge "Make rotate QS tile function as on/off to match circle styling"
Mike Digman [Thu, 18 Jan 2018 18:39:42 +0000 (18:39 +0000)]
Merge "Make rotate QS tile function as on/off to match circle styling"

6 years agoRemove wifi_allow_scan_with_traffic
Ningyuan Wang [Wed, 17 Jan 2018 23:21:12 +0000 (15:21 -0800)]
Remove wifi_allow_scan_with_traffic

Bug: 72116071
Test: compile
Test: Manually check developer options, make sure roam scan is
gone

Change-Id: I7f43d62f4c668d27b0f6743e34842cdef8b67f9b

6 years agoCompute hyphenated word pieces in MeasuredText
Seigo Nonaka [Fri, 12 Jan 2018 22:06:29 +0000 (14:06 -0800)]
Compute hyphenated word pieces in MeasuredText

Bug: 67504091
Test: bit CtsTextTestCases:*
Change-Id: Id1ff5abbf6d433a2d8baad364133fca98d1fe450

6 years agoMerge "Check if UserState is null in stopGuestOrEphemeralUserIfBackground"
TreeHugger Robot [Thu, 18 Jan 2018 18:27:19 +0000 (18:27 +0000)]
Merge "Check if UserState is null in stopGuestOrEphemeralUserIfBackground"

6 years agoMerge "Merge "Added APIs for Connection-oriented channels" am: e1992384e0 am: 288915b...
Android Build Merger (Role) [Thu, 18 Jan 2018 18:21:29 +0000 (18:21 +0000)]
Merge "Merge "Added APIs for Connection-oriented channels" am: e1992384e0 am: 288915bedc am: 39f133eed2"

6 years agoMerge "DisplayCutout: Actually reload displays when resource overlays change"
TreeHugger Robot [Thu, 18 Jan 2018 18:21:25 +0000 (18:21 +0000)]
Merge "DisplayCutout: Actually reload displays when resource overlays change"

6 years agoMerge "Set windowElevation to 0 on watch dialogs."
Andrew Zeng [Thu, 18 Jan 2018 18:20:30 +0000 (18:20 +0000)]
Merge "Set windowElevation to 0 on watch dialogs."

6 years agoMerge "Added APIs for Connection-oriented channels" am: e1992384e0 am: 288915bedc
Stanley Tng [Thu, 18 Jan 2018 18:19:25 +0000 (18:19 +0000)]
Merge "Added APIs for Connection-oriented channels" am: e1992384e0 am: 288915bedc
am: 39f133eed2

Change-Id: I79afa5ef129790588dca91266f79a6125edefd06

6 years agoMerge "Added APIs for Connection-oriented channels" am: e1992384e0
Stanley Tng [Thu, 18 Jan 2018 18:08:37 +0000 (18:08 +0000)]
Merge "Added APIs for Connection-oriented channels" am: e1992384e0
am: 288915bedc

Change-Id: Iaf2aa40e8e6e2621c146fcabe0f46c3dd1bfedc4

6 years agoMerge "Move the signal traffic indicators out of the QS icon circle bounds"
Rohan Shah [Thu, 18 Jan 2018 18:05:01 +0000 (18:05 +0000)]
Merge "Move the signal traffic indicators out of the QS icon circle bounds"

6 years agoMerge "Added logging for OverviewProxyService"
Winson Chung [Thu, 18 Jan 2018 18:01:55 +0000 (18:01 +0000)]
Merge "Added logging for OverviewProxyService"

6 years agoRename RecoveryManager to RecoveryController
Robert Berry [Thu, 18 Jan 2018 17:49:07 +0000 (17:49 +0000)]
Rename RecoveryManager to RecoveryController

This fixes the linting error that happens when we attempt to make this a
@SystemApi.

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

Change-Id: Ib9eea030874608d73ceeff21ee8d7e9d5a75bce8

6 years agoMerge "Added APIs for Connection-oriented channels"
Stanley Tng [Thu, 18 Jan 2018 17:59:19 +0000 (17:59 +0000)]
Merge "Added APIs for Connection-oriented channels"
am: e1992384e0

Change-Id: If7cb99a59aee8640f6dddd96f2388e2a5284df45

6 years agoMerge "consolidate subsystem sleep state atoms"
TreeHugger Robot [Thu, 18 Jan 2018 17:56:39 +0000 (17:56 +0000)]
Merge "consolidate subsystem sleep state atoms"

6 years agoMerge "Ignore first crash dialog."
Andrew Sapperstein [Thu, 18 Jan 2018 17:49:33 +0000 (17:49 +0000)]
Merge "Ignore first crash dialog."

6 years agoMerge "Use RecoverySession object to hide session IDs (redux)"
TreeHugger Robot [Thu, 18 Jan 2018 17:44:37 +0000 (17:44 +0000)]
Merge "Use RecoverySession object to hide session IDs (redux)"

6 years agoMerge "Put contacts/calendar providers in except-idle whitelist"
TreeHugger Robot [Thu, 18 Jan 2018 17:41:35 +0000 (17:41 +0000)]
Merge "Put contacts/calendar providers in except-idle whitelist"

6 years agoMerge "Add "results source" parameter to RemoteInput"
Petr Cermak [Thu, 18 Jan 2018 17:39:34 +0000 (17:39 +0000)]
Merge "Add "results source" parameter to RemoteInput"

6 years agoRemove work profile off status bar icon
Tony Mak [Thu, 18 Jan 2018 17:17:23 +0000 (17:17 +0000)]
Remove work profile off status bar icon

Test: Turn off work -> observe that no work profile off icon in status bar

Change-Id: I050da9271cd409f17a3e314590ce338bc03b4971
Fix: 71568134

6 years agoAudioAttributes: note that AAudio.h should sync
Phil Burk [Wed, 17 Jan 2018 23:01:43 +0000 (15:01 -0800)]
AudioAttributes: note that AAudio.h should sync

Usage and other attributes may need to be added to AAudio.

Bug: 68052449
Test: just a comment
Change-Id: I6858ef22e437cbd1f9c31142516eca4705422fa6

6 years agoMerge "[GLUtils] Use GL_* types for FP16 bitmap."
Peiyong Lin [Thu, 18 Jan 2018 16:51:48 +0000 (16:51 +0000)]
Merge "[GLUtils] Use GL_* types for FP16 bitmap."

6 years agoMerge "Add adb command to get max running users"
TreeHugger Robot [Thu, 18 Jan 2018 16:50:31 +0000 (16:50 +0000)]
Merge "Add adb command to get max running users"

6 years agoCheck if UserState is null in stopGuestOrEphemeralUserIfBackground
Alex Chau [Thu, 18 Jan 2018 16:07:36 +0000 (16:07 +0000)]
Check if UserState is null in stopGuestOrEphemeralUserIfBackground

- UserState may be removed from mStartedUsers if it has already been stopped

Bug: 72133858
Test: Manually create secondary user, and exit the user in SetupWizard
Change-Id: I92783f89a9d4de9a7eca81e688b4e115c2f5535a

6 years agoMerge "Added APIs for Connection-oriented channels"
Treehugger Robot [Thu, 18 Jan 2018 16:42:33 +0000 (16:42 +0000)]
Merge "Added APIs for Connection-oriented channels"

6 years agoMerge "Don't bind netpolicy right away from batterystats"
TreeHugger Robot [Thu, 18 Jan 2018 16:21:25 +0000 (16:21 +0000)]
Merge "Don't bind netpolicy right away from batterystats"

6 years agoDisplayCutout: Actually reload displays when resource overlays change
Adrian Roos [Wed, 17 Jan 2018 11:54:50 +0000 (12:54 +0100)]
DisplayCutout: Actually reload displays when resource overlays change

This allows the DisplayManager to pick up changes to the
DisplayCutout resource, which is used to implement emulation
of the overlay.

Bug: 65689439
Test: adb shell overlay enable ...; verify cutout is picked up immediately and not only after toggling the display
Change-Id: I22c32802859d7c8cc373cbb8f17e41cdaf84c844

6 years agoMerge "Fix NPE in ActivityStack.ensureActivitiesVisibleLocked"
TreeHugger Robot [Thu, 18 Jan 2018 16:02:32 +0000 (16:02 +0000)]
Merge "Fix NPE in ActivityStack.ensureActivitiesVisibleLocked"

6 years agoMerge "Disallow starting activities without new task from non-activity context."
Bryce Lee [Thu, 18 Jan 2018 15:49:15 +0000 (15:49 +0000)]
Merge "Disallow starting activities without new task from non-activity context."

6 years agoMerge changes Ie2ec98d9,I81ce2bef
TreeHugger Robot [Thu, 18 Jan 2018 15:34:28 +0000 (15:34 +0000)]
Merge changes Ie2ec98d9,I81ce2bef

* changes:
  Make ImageDecoder return animated Drawables
  Ensure that PostProcess Canvas is released

6 years agoMerge "Add more brightness config details to dumpsys"
Kenny Guy [Thu, 18 Jan 2018 15:18:08 +0000 (15:18 +0000)]
Merge "Add more brightness config details to dumpsys"

6 years agoAdd adb command to get max running users
Alex Chau [Tue, 16 Jan 2018 15:01:15 +0000 (15:01 +0000)]
Add adb command to get max running users

Bug: 72033601
Test: New command is working
Change-Id: I38746a2c03a6da35e7d8a149e1fb0b3604234dbc

6 years agoMerge "Priority only DND updates"
TreeHugger Robot [Thu, 18 Jan 2018 15:13:19 +0000 (15:13 +0000)]
Merge "Priority only DND updates"

6 years agoUse RecoverySession object to hide session IDs (redux)
Robert Berry [Thu, 18 Jan 2018 12:53:29 +0000 (12:53 +0000)]
Use RecoverySession object to hide session IDs (redux)

Session IDs are an implementation detail that the framework can (and should)
abstract away. This was previously reverted due to breaking master.

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

Change-Id: I4427c818348c054ada39d799b6da3b739f27eba9

6 years agoFix notification sorting.
Julia Reynolds [Thu, 18 Jan 2018 14:25:44 +0000 (09:25 -0500)]
Fix notification sorting.

Calls are now appropriately sorted.

Test: runtest systemui-notification
Change-Id: Iaeb8d9c2d58c0bfdf3fdeaa9fe7be86f9ab05189
Fixes: 72145403

6 years agoMerge "Add hint to indicate 'see more' type content"
TreeHugger Robot [Thu, 18 Jan 2018 14:17:14 +0000 (14:17 +0000)]
Merge "Add hint to indicate 'see more' type content"

6 years agoFix NPE in ActivityStack.ensureActivitiesVisibleLocked
Wale Ogunwale [Thu, 18 Jan 2018 14:15:45 +0000 (06:15 -0800)]
Fix NPE in ActivityStack.ensureActivitiesVisibleLocked

Follow-up to ag/3345710 where we add call to the display object.
It is possible for ensureActivitiesVisibleLocked to be called
when the stack has been removed from the display and no longer
has any tasks. So, we need to check if the stack is attached to
the display before trying to access it.

Change-Id: I9d7c3d00c1af1813b2c408339188fcef2c1a1a6f
Fixes: 72107481
Test: manual

6 years agoRemove all caps style
Julia Reynolds [Wed, 17 Jan 2018 20:27:44 +0000 (15:27 -0500)]
Remove all caps style

Test: manual
Change-Id: Ifa83ce1daa9dab5a29adabd27ceee066b19a22b1

6 years agoDon't bind netpolicy right away from batterystats
Robin Lee [Thu, 18 Jan 2018 13:34:20 +0000 (14:34 +0100)]
Don't bind netpolicy right away from batterystats

batteryservice is a 'core' service
netpolicy is an 'other' service

Trying to bind to it straight away fails and leads to a series of
scary Log.wtf messages during boot.

Bug: 72120141
Test: adb logcat -b all
Change-Id: Iad85eaa4b0ec48eb572c22028aca8bd7847fb678

6 years agoFix crash in EditText#getText
Clara Bayarri [Thu, 18 Jan 2018 12:36:00 +0000 (12:36 +0000)]
Fix crash in EditText#getText

The fact that View's constructor may call other methods before the
TextView constructor has a chance to initialize values means that
getText() may return null in the rare case where it is called
before the constructor.

Protect getText() from running into errors when the text is null,
as it just means the value is not ready yet.

Bug: 71638589
Test: CTS in topic
Change-Id: Ie11233416385353f78e3ee27fb0d3ec9b671512f

6 years agoMerge "Revert "Use RecoverySession object to hide session IDs""
Robert Berry [Thu, 18 Jan 2018 12:24:06 +0000 (12:24 +0000)]
Merge "Revert "Use RecoverySession object to hide session IDs""

6 years agoRevert "Use RecoverySession object to hide session IDs"
Robert Berry [Thu, 18 Jan 2018 12:22:38 +0000 (12:22 +0000)]
Revert "Use RecoverySession object to hide session IDs"

This reverts commit 988c55ce67459553bad517426a924d06a89b059f.

Reason for revert: broke some tests

Change-Id: Ib43099aebc8ff025e052337475bab13445da74eb

6 years agoMerge "Fix extra space in Suggestions Popup"
TreeHugger Robot [Thu, 18 Jan 2018 12:20:37 +0000 (12:20 +0000)]
Merge "Fix extra space in Suggestions Popup"

6 years agoMerge "Fixing incorrect doc string"
TreeHugger Robot [Thu, 18 Jan 2018 11:55:35 +0000 (11:55 +0000)]
Merge "Fixing incorrect doc string"

6 years agoMerge "Proto change for dimension from condition."
TreeHugger Robot [Thu, 18 Jan 2018 11:19:24 +0000 (11:19 +0000)]
Merge "Proto change for dimension from condition."

6 years agoMerge changes I73f54855,I69d3a7c7,I32141ecf
TreeHugger Robot [Thu, 18 Jan 2018 11:11:40 +0000 (11:11 +0000)]
Merge changes I73f54855,I69d3a7c7,I32141ecf

* changes:
  Fixed an issue where the notification wouldn't go away
  Fixed an issue where the action bar below wasn't rounded
  Improved the experience when sending multiple messages

6 years agoMerge "Prevent quick scrub when dragging up"
TreeHugger Robot [Thu, 18 Jan 2018 11:08:33 +0000 (11:08 +0000)]
Merge "Prevent quick scrub when dragging up"

6 years agoMerge "Update the VaultParams encoding to reflect the recent change in the format...
TreeHugger Robot [Thu, 18 Jan 2018 11:08:26 +0000 (11:08 +0000)]
Merge "Update the VaultParams encoding to reflect the recent change in the format of vault_handle"

6 years agoMerge "Remove strings for wifi aggressive handover"
TreeHugger Robot [Thu, 18 Jan 2018 10:59:21 +0000 (10:59 +0000)]
Merge "Remove strings for wifi aggressive handover"

6 years agoMerge "Import translations. DO NOT MERGE"
TreeHugger Robot [Thu, 18 Jan 2018 10:56:28 +0000 (10:56 +0000)]
Merge "Import translations. DO NOT MERGE"

6 years agoMerge "Import translations. DO NOT MERGE"
TreeHugger Robot [Thu, 18 Jan 2018 10:53:27 +0000 (10:53 +0000)]
Merge "Import translations. DO NOT MERGE"

6 years agoMerge "Make sure to mutex around job-set iteration"
TreeHugger Robot [Thu, 18 Jan 2018 10:46:32 +0000 (10:46 +0000)]
Merge "Make sure to mutex around job-set iteration"

6 years agoMerge "Merge "Javadoc fixes to Time" am: b3c2efc615 am: b51c638a6c am: 90a56a59d5"
Android Build Merger (Role) [Thu, 18 Jan 2018 10:41:00 +0000 (10:41 +0000)]
Merge "Merge "Javadoc fixes to Time" am: b3c2efc615 am: b51c638a6c am: 90a56a59d5"

6 years agoMerge "Javadoc fixes to Time" am: b3c2efc615 am: b51c638a6c
Neil Fuller [Thu, 18 Jan 2018 10:40:42 +0000 (10:40 +0000)]
Merge "Javadoc fixes to Time" am: b3c2efc615 am: b51c638a6c
am: 90a56a59d5

Change-Id: I62545bdd0604ee0911249abd7628c99868093c77

6 years agoMerge "Use RecoverySession object to hide session IDs"
TreeHugger Robot [Thu, 18 Jan 2018 10:40:24 +0000 (10:40 +0000)]
Merge "Use RecoverySession object to hide session IDs"

6 years agoMerge "Rename Robo tests to BackupManagerServiceTest"
Annie Meng [Thu, 18 Jan 2018 10:34:07 +0000 (10:34 +0000)]
Merge "Rename Robo tests to BackupManagerServiceTest"

6 years agoMerge "Javadoc fixes to Time" am: b3c2efc615
Neil Fuller [Thu, 18 Jan 2018 10:31:35 +0000 (10:31 +0000)]
Merge "Javadoc fixes to Time" am: b3c2efc615
am: b51c638a6c

Change-Id: Ifea3eb9d25754155681b1f74096eacac1fa0b259

6 years agoMerge "Import translations. DO NOT MERGE"
TreeHugger Robot [Thu, 18 Jan 2018 10:27:57 +0000 (10:27 +0000)]
Merge "Import translations. DO NOT MERGE"

6 years agoMerge "KeyStore: Remove duplicate method"
TreeHugger Robot [Thu, 18 Jan 2018 10:26:44 +0000 (10:26 +0000)]
Merge "KeyStore: Remove duplicate method"

6 years agoMerge "Javadoc fixes to Time"
Neil Fuller [Thu, 18 Jan 2018 10:26:13 +0000 (10:26 +0000)]
Merge "Javadoc fixes to Time"
am: b3c2efc615

Change-Id: I9793670f518d15fc42caa01a519c33e451998a77

6 years agoMerge "Import translations. DO NOT MERGE"
TreeHugger Robot [Thu, 18 Jan 2018 10:20:39 +0000 (10:20 +0000)]
Merge "Import translations. DO NOT MERGE"

6 years agoMerge "Rename KeychainProtectionParameter to KeychainProtectionParams"
TreeHugger Robot [Thu, 18 Jan 2018 10:09:09 +0000 (10:09 +0000)]
Merge "Rename KeychainProtectionParameter to KeychainProtectionParams"

6 years agoMerge "Adjust file reference type in 'aapt2 convert'"
David Chaloupka [Thu, 18 Jan 2018 10:06:01 +0000 (10:06 +0000)]
Merge "Adjust file reference type in 'aapt2 convert'"

6 years agoFixing incorrect doc string
Jan Althaus [Thu, 18 Jan 2018 09:50:32 +0000 (10:50 +0100)]
Fixing incorrect doc string

Test: N/A
Change-Id: I718c44902c44097b5883fd1f204ef66279b5cca4

6 years agoMerge "Promote DISALLOW_RUN_IN_BACKGROUND to SystemAPI"
TreeHugger Robot [Thu, 18 Jan 2018 09:26:37 +0000 (09:26 +0000)]
Merge "Promote DISALLOW_RUN_IN_BACKGROUND to SystemAPI"

6 years agoMerge "Javadoc fixes to Time"
Neil Fuller [Thu, 18 Jan 2018 09:18:27 +0000 (09:18 +0000)]
Merge "Javadoc fixes to Time"

6 years agoUse RecoverySession object to hide session IDs
Robert Berry [Wed, 17 Jan 2018 14:16:39 +0000 (14:16 +0000)]
Use RecoverySession object to hide session IDs

Session IDs are an implementation detail that the framework can (and should)
abstract away.

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

Change-Id: Ieba641a9b54ac9bba197a6e9749b621a07e40c67

6 years agoRename KeychainProtectionParameter to KeychainProtectionParams
Robert Berry [Wed, 17 Jan 2018 23:28:45 +0000 (23:28 +0000)]
Rename KeychainProtectionParameter to KeychainProtectionParams

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

6 years agoUpdate the VaultParams encoding to reflect the recent change in the
Bo Zhu [Thu, 18 Jan 2018 01:34:26 +0000 (17:34 -0800)]
Update the VaultParams encoding to reflect the recent change in the
format of vault_handle

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

Change-Id: I105d17ac87b70795fa977b7649c7a1fdcb97b5e9

6 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 18 Jan 2018 07:23:21 +0000 (23:23 -0800)]
Import translations. DO NOT MERGE

Change-Id: I187ddfcd5388173662e45da5ef3f19a1d17be32c
Auto-generated-cl: translation import

6 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 18 Jan 2018 07:19:59 +0000 (23:19 -0800)]
Import translations. DO NOT MERGE

Change-Id: I8457b08b667801127c2bb943639a4ea2ff86de05
Auto-generated-cl: translation import

6 years agoMerge "Clean up: remove drawer from root settings layout"
TreeHugger Robot [Thu, 18 Jan 2018 06:37:27 +0000 (06:37 +0000)]
Merge "Clean up: remove drawer from root settings layout"

6 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 18 Jan 2018 06:25:01 +0000 (22:25 -0800)]
Import translations. DO NOT MERGE

Change-Id: I6b13005d123462b08911d4fec5600311fccf9dee
Auto-generated-cl: translation import

6 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 18 Jan 2018 05:55:22 +0000 (21:55 -0800)]
Import translations. DO NOT MERGE

Change-Id: I1840cf7401e12dbfc7624e4ffd155f903fb59e36
Auto-generated-cl: translation import

6 years agoProto change for dimension from condition.
Yangster-mac [Wed, 17 Jan 2018 20:26:34 +0000 (12:26 -0800)]
Proto change for dimension from condition.

Test: all statsd unit tests and cts tests passed.

Change-Id: I955143aca7c76e2e22a10d7ba42eb797bd32e147

6 years agoMerge "Add APIs to EuiccCardManager." am: a5bc474e2c am: f07319a6df
Holly Jiuyu Sun [Thu, 18 Jan 2018 04:28:28 +0000 (04:28 +0000)]
Merge "Add APIs to EuiccCardManager." am: a5bc474e2c am: f07319a6df
am: beacd5e4fa

Change-Id: I7aa42d89c69911137a86b86ee59463efe46a81c3

6 years agoMerge "Add "not congested" network capability." am: ffaddf73de am: abb158f712
Jeff Sharkey [Thu, 18 Jan 2018 04:20:44 +0000 (04:20 +0000)]
Merge "Add "not congested" network capability." am: ffaddf73de am: abb158f712
am: 1ed2bee762

Change-Id: I836fedeab34f34a43e0257e395fca1f735bc6d61

6 years agoMerge "Add APIs to EuiccCardManager." am: a5bc474e2c
Holly Jiuyu Sun [Thu, 18 Jan 2018 04:14:54 +0000 (04:14 +0000)]
Merge "Add APIs to EuiccCardManager." am: a5bc474e2c
am: f07319a6df

Change-Id: I71b5ea764f306a8a852f08a99f6a7247109e3511

6 years agoMerge "Add basic resolution of Private DNS hostname" am: a3bf36f050 am: 4218c522a7
Erik Kline [Thu, 18 Jan 2018 04:10:12 +0000 (04:10 +0000)]
Merge "Add basic resolution of Private DNS hostname" am: a3bf36f050 am: 4218c522a7
am: 0b250b6132

Change-Id: Iacdad88b49aff3e34afc93acfb8d3eeca9745c43