OSDN Git Service
Siddharth Ray [Thu, 14 Dec 2017 23:15:28 +0000 (15:15 -0800)]
Wifi: Add scanning, activity time and API
Addition of Wifi Scanning time to Aggregate BatteryStats
Addition of Wifi Active time to BatteryStats (aggregate)
Addition of API to obtain Wifi battery stats for power drain diagnostics.
BUG:
67213886
Test: Manual
Change-Id: I4f4c27ba839017d44feca685a4fae2f130d31765
TreeHugger Robot [Sat, 20 Jan 2018 17:58:25 +0000 (17:58 +0000)]
Merge "Multi-A2DP support - add a new internal API to suppress Audio Noisy intent"
TreeHugger Robot [Sat, 20 Jan 2018 16:42:51 +0000 (16:42 +0000)]
Merge "Add new HardwareBuffer usages and formats."
TreeHugger Robot [Sat, 20 Jan 2018 16:29:05 +0000 (16:29 +0000)]
Merge "add atoms for cpu power calculation"
TreeHugger Robot [Sat, 20 Jan 2018 16:24:30 +0000 (16:24 +0000)]
Merge "Split string properly in package name validator"
Michal Karpinski [Sat, 20 Jan 2018 14:31:25 +0000 (14:31 +0000)]
Split string properly in package name validator
Test: atest frameworks/base/core/tests/coretests/src/android/provider/SettingsValidatorsTest.java
Bug:
64988620
Change-Id: I35b93a9ba317dc31494bffb7ad3576ad7290220f
David Brazdil [Sat, 20 Jan 2018 11:43:40 +0000 (11:43 +0000)]
Merge "Generate new API signatures from doclava" am:
fa208b4226 am:
72b7f03179
am:
ccc31988ee
Change-Id: Ibc40df91d9aa4f1258856ddcd85204ce62297bf1
David Brazdil [Sat, 20 Jan 2018 11:33:16 +0000 (11:33 +0000)]
Merge "Generate new API signatures from doclava" am:
fa208b4226
am:
72b7f03179
Change-Id: I7dbf94c493bc79f4200afc45e6ed58543359c9ff
David Brazdil [Sat, 20 Jan 2018 11:23:49 +0000 (11:23 +0000)]
Merge "Generate new API signatures from doclava"
am:
fa208b4226
Change-Id: Iae4cc67435b84c868a446dc7ac16a618656bbdbb
David Brazdil [Sat, 20 Jan 2018 10:06:22 +0000 (10:06 +0000)]
Merge "Generate new API signatures from doclava"
yinxu [Sat, 20 Jan 2018 10:04:11 +0000 (10:04 +0000)]
Merge "Add CARD_ID in SubscriptionInfo database" am:
6745e15d17 am:
33de998afe
am:
a8a799b6a6
Change-Id: I2ba99e9fe94621b982a74cf6178afbfc64d32ee2
yinxu [Sat, 20 Jan 2018 09:56:08 +0000 (09:56 +0000)]
Merge "Add CARD_ID in SubscriptionInfo database" am:
6745e15d17
am:
33de998afe
Change-Id: I63246ba54d112ef75ca6989c16d7ae979bde552a
yinxu [Sat, 20 Jan 2018 09:47:20 +0000 (09:47 +0000)]
Merge "Add CARD_ID in SubscriptionInfo database"
am:
6745e15d17
Change-Id: I3df57fc50d9e928d74c50b2b99fde63e757e7e78
Treehugger Robot [Sat, 20 Jan 2018 08:28:24 +0000 (08:28 +0000)]
Merge "Add CARD_ID in SubscriptionInfo database"
Sudheer Shanka [Sat, 20 Jan 2018 08:26:32 +0000 (08:26 +0000)]
Merge "Load admin data in DPMS asynchronously during boot."
TreeHugger Robot [Sat, 20 Jan 2018 07:40:23 +0000 (07:40 +0000)]
Merge "Update config_wifi_tether_enable value."
Qingxi Li [Sat, 20 Jan 2018 06:20:02 +0000 (06:20 +0000)]
Merge "Change RecoverySystem#wipeEuiccData to public"
Chenjie Yu [Sat, 13 Jan 2018 20:41:08 +0000 (12:41 -0800)]
add atoms for cpu power calculation
Test: will add cts tests for them
Change-Id: Ifefa3697ff64e8c484f79d08caf053bfc712b794
TreeHugger Robot [Sat, 20 Jan 2018 05:48:37 +0000 (05:48 +0000)]
Merge "AudioTrack: support for offloaded playback"
Phil Weaver [Sat, 20 Jan 2018 05:13:38 +0000 (05:13 +0000)]
Merge "Add accessibility support for tooltips"
Peiyong Lin [Sat, 20 Jan 2018 05:11:09 +0000 (05:11 +0000)]
Merge "[GLUtils] Pass the correct format into glTexImage2D and glTexSubImage2D."
Felipe Leme [Sat, 20 Jan 2018 05:01:43 +0000 (05:01 +0000)]
Merge "Minor API changes on Autofill Field Classification:"
Felipe Leme [Sat, 20 Jan 2018 04:59:23 +0000 (04:59 +0000)]
Merge "Implemented getAlgorithm() and getDefaultAlgorithm() using manifest metadata."
Rajeev Kumar [Sat, 20 Jan 2018 04:30:53 +0000 (04:30 +0000)]
Merge "Add atoms to log memory metrics."
TreeHugger Robot [Sat, 20 Jan 2018 04:09:35 +0000 (04:09 +0000)]
Merge "Don't record audio if UID is idle - framework"
Pavlin Radoslavov [Sat, 20 Jan 2018 02:20:04 +0000 (18:20 -0800)]
Multi-A2DP support - add a new internal API to suppress Audio Noisy intent
The new API setBluetoothA2dpDeviceConnectionStateSuppressNoisyIntent()
is similar to the existing setBluetoothA2dpDeviceConnectionState()
except that it takes one extra argument that indicates whether the
AudioManager.ACTION_AUDIO_BECOMING_NOISY intent will be sent:
setBluetoothA2dpDeviceConnectionStateSuppressNoisyIntent(
..., boolean suppressNoisyIntent)
This API is needed so the Active A2DP Sink device can be changed
while audio is streaming, and the audio continues playing on the new
Active Device.
Bug:
69269748
Test: Manual: multiple connected A2DP devices, and selecting each as
the Active Device.
Change-Id: I75766a58d9e6b42b3ce68bd9ad3a7a72ca5a1023
Phil Weaver [Sat, 20 Jan 2018 02:56:04 +0000 (02:56 +0000)]
Merge "Add a11y action to take screenshot"
TreeHugger Robot [Sat, 20 Jan 2018 02:34:40 +0000 (02:34 +0000)]
Merge "Statsd -> Perfetto integration"
TreeHugger Robot [Sat, 20 Jan 2018 02:22:21 +0000 (02:22 +0000)]
Merge "Rename getConfigFlag to isConfigFlagSet."
TreeHugger Robot [Sat, 20 Jan 2018 02:22:15 +0000 (02:22 +0000)]
Merge "Add "exemptForBatterySaver" to ForceAppStandbyTracker"
TreeHugger Robot [Sat, 20 Jan 2018 01:37:29 +0000 (01:37 +0000)]
Merge "No sensor access to idle UIDs - framework"
TreeHugger Robot [Sat, 20 Jan 2018 01:31:23 +0000 (01:31 +0000)]
Merge "AudioService: fix deadlock between readSettings() and VSS.setAllIndexes()"
TreeHugger Robot [Sat, 20 Jan 2018 01:00:54 +0000 (01:00 +0000)]
Merge "Update JavaDoc for BackgroundColorSpan and ForegroundColorSpan."
Rajeev Kumar [Thu, 18 Jan 2018 23:49:11 +0000 (15:49 -0800)]
Add atoms to log memory metrics.
Test: Manual
Bug:
72177881
Change-Id: I0e77c6651d10e6592e6bbd34c55186e5e49a70e9
Doris Ling [Sat, 20 Jan 2018 00:44:59 +0000 (16:44 -0800)]
Update config_wifi_tether_enable value.
The TetherService has moved to a sub package. Update the config value to
reflect the new package info.
Change-Id: I1d0d03117dd6533d96f170e80f7f58c043e96d46
Fixes:
69844871
Test: rebuild
TreeHugger Robot [Sat, 20 Jan 2018 00:26:24 +0000 (00:26 +0000)]
Merge "Double the battery history size on userdebug/eng"
Makoto Onuki [Fri, 19 Jan 2018 23:43:16 +0000 (15:43 -0800)]
Add "exemptForBatterySaver" to ForceAppStandbyTracker
Bug:
72125364
Test: atest CtsBatterySavingTestCases
Change-Id: I716dc53f06a74e3854aeaeff5c1567642ebaa0c9
Primiano Tucci [Wed, 10 Jan 2018 12:14:50 +0000 (12:14 +0000)]
Statsd -> Perfetto integration
This CL invokes the perfetto client utility to start the
collection of a trace when an anomaly that subscribed to
Perfetto is detected. The code simply spawns the
/system/bin/perfetto client and passes the trace config via
stdin. The client takes care of the dropbox upload.
The CollectPerfettoTraceAndUploadToDropbox() function does
NOT wait for the full trace collection (in order to avoid
blocking statsd) and instead returns immediately after having
spawned perfetto.
Change-Id: I4f02067bad7a46ede7b6e4841cdcf381c1a4e2a7
Bug:
71795552
Phil Weaver [Tue, 16 Jan 2018 23:32:30 +0000 (15:32 -0800)]
Add a11y action to take screenshot
Bug:
70392997
Test: Adding unit test for functionality, cts test
for presence of api.
Change-Id: Ib5bc2217e1d29f527db0f0fadb69fd8249d6c279
TreeHugger Robot [Fri, 19 Jan 2018 23:33:07 +0000 (23:33 +0000)]
Merge "ApkSignatureVerifier: expose verity interfaces"
Yi Jin [Fri, 19 Jan 2018 23:27:32 +0000 (23:27 +0000)]
Merge "Fix permissions problems of incidentd."
TreeHugger Robot [Fri, 19 Jan 2018 23:08:15 +0000 (23:08 +0000)]
Merge "Fix buffer overflow when the last chunk is 4kb"
Jean-Michel Trivi [Mon, 8 Jan 2018 23:43:35 +0000 (15:43 -0800)]
AudioTrack: support for offloaded playback
Surface new callbacks from native AudioTrack to
Java through the existing callback method and
post to the Java instance.
New AudioManager method to query whether offload
is supported.
Allow using non-PCM format on a track built for
offload (new option in AudioTrack.Builder)
Numerous "todo" are added for the unhide of the
API additions and will be in a separate patch.
Bug:
63934228
Test: same as MediaPlayer2 tests
Change-Id: I98a81ffffc95c7596a39ee634dcb89bb854f3178
Rob Carr [Fri, 19 Jan 2018 22:58:41 +0000 (22:58 +0000)]
Merge "Rework stack Z-ordering promotion."
TreeHugger Robot [Fri, 19 Jan 2018 22:54:28 +0000 (22:54 +0000)]
Merge "Add performance tests for query / get"
Tomasz Wasilczyk [Fri, 19 Jan 2018 22:51:47 +0000 (22:51 +0000)]
Merge "Update ProgramSelector to match HAL 2.0."
Makoto Onuki [Thu, 18 Jan 2018 16:44:28 +0000 (08:44 -0800)]
Double the battery history size on userdebug/eng
Bug:
67297625
Test: Build & boot. (we experimented with the factor of 4 previously on OMR1.)
Change-Id: Ie03c31ade89c76efd05e907a5a0b74942e3f3df5
Leon Scroggins [Fri, 19 Jan 2018 22:10:53 +0000 (22:10 +0000)]
Merge "Use ImageDecoder for BitmapDrawable"
TreeHugger Robot [Fri, 19 Jan 2018 21:54:36 +0000 (21:54 +0000)]
Merge "Clear calling uid in isAppEligibleForBackup() and variant"
TreeHugger Robot [Fri, 19 Jan 2018 21:53:29 +0000 (21:53 +0000)]
Merge "Add validators for all Settings.Secure settings that are backed up"
Android Build Merger (Role) [Fri, 19 Jan 2018 21:48:44 +0000 (21:48 +0000)]
Merge "Merge "Make LTE signal bar thresholds customizable with carrier configuration" am:
8fb3bdc36f am:
5d90d0e2b7 am:
337a9ef04f -s ours"
Jordan Liu [Fri, 19 Jan 2018 21:46:45 +0000 (21:46 +0000)]
Merge "Make LTE signal bar thresholds customizable with carrier configuration" am:
8fb3bdc36f am:
5d90d0e2b7
am:
337a9ef04f -s ours
Change-Id: Icd92f19bbaebd7137dadf86e571954b153dadc65
Roshan Pius [Fri, 19 Jan 2018 21:43:39 +0000 (21:43 +0000)]
Merge changes I8031de0c,I390523b0
* changes:
config.xml: Add configuration to enable/disable
80211AC
config.xml: Add configuration to enable/disable ACS
Siddharth Ray [Fri, 19 Jan 2018 21:40:07 +0000 (21:40 +0000)]
Merge "GPS Signal Quality added to BatteryStats"
Jordan Liu [Fri, 19 Jan 2018 21:36:06 +0000 (21:36 +0000)]
Merge "Make LTE signal bar thresholds customizable with carrier configuration" am:
8fb3bdc36f
am:
5d90d0e2b7
Change-Id: Ia3fe7265126023ec8c2ba5aaa6d09cd1ed1e9c43
Roshan Pius [Fri, 19 Jan 2018 21:33:47 +0000 (21:33 +0000)]
Merge "WifiConfiguration: Add support for auto-selecting AP band"
TreeHugger Robot [Fri, 19 Jan 2018 21:33:22 +0000 (21:33 +0000)]
Merge "fix bug in CpuTimePerUidFreqPuller to pull the correct file"
Jordan Liu [Fri, 19 Jan 2018 21:29:10 +0000 (21:29 +0000)]
Merge "Make LTE signal bar thresholds customizable with carrier configuration"
am:
8fb3bdc36f
Change-Id: Icf95b62e2828de2175b2c9767741138c507c0e5b
Bernardo Rufino [Fri, 19 Jan 2018 20:57:49 +0000 (20:57 +0000)]
Merge "Binding on-demand #11: Dump TransportClients"
Lei Yu [Fri, 19 Jan 2018 20:47:52 +0000 (20:47 +0000)]
Merge "Add metric for restricted app detail page"
Victor Hsieh [Fri, 19 Jan 2018 20:46:23 +0000 (12:46 -0800)]
Fix buffer overflow when the last chunk is 4kb
Test: adb install GtsNetStatsTestCases.apk # works only w/ the patch
Bug:
72189232
Bug:
30972906
Change-Id: I9f01279d783dd5adf31cfda4abd452240ad25ca3
TreeHugger Robot [Fri, 19 Jan 2018 20:43:19 +0000 (20:43 +0000)]
Merge "Fixed the possibility to report rejected touch events"
TreeHugger Robot [Fri, 19 Jan 2018 20:41:45 +0000 (20:41 +0000)]
Merge "Add cluster&active cost to cpu power"
Jordan Liu [Fri, 19 Jan 2018 20:39:43 +0000 (20:39 +0000)]
Merge "Make LTE signal bar thresholds customizable with carrier configuration"
Todd Kennedy [Fri, 19 Jan 2018 20:32:21 +0000 (12:32 -0800)]
Add performance tests for query / get
Bug:
68777480
Test: m CorePerfTests
Test: adb install CorePerfTests.apk
Test: adb shell am instrument -w -e class android.os.PackageManagerPerfTest com.android.perftests.core/android.support.test.runner.AndroidJUnitRunner
Change-Id: I047d9d2e84665fe641a7c354a9f1b16c40f7ff31
nharold [Fri, 19 Jan 2018 20:25:18 +0000 (20:25 +0000)]
Merge "Add Tunnel Interface APIs to IpSecManager" am:
08d07aec50 am:
696cff166c
am:
0174b8afcf
Change-Id: I094751d965b679e85a0f200b2382f1715d69e400
Qingxi Li [Tue, 9 Jan 2018 18:57:38 +0000 (10:57 -0800)]
Change RecoverySystem#wipeEuiccData to public
This function is used to wipe the eSIM profiles from eUICC card which
should not only be called from FDR and also from the network reset. This
CL changes it to hide public API.
Bug:
62961867
Test: TBC
Change-Id: I1d716763720e9a2c897b9e85f95bab562fe150e2
nharold [Fri, 19 Jan 2018 20:16:38 +0000 (20:16 +0000)]
Merge "Add Tunnel Interface APIs to IpSecManager" am:
08d07aec50
am:
696cff166c
Change-Id: I0cd07c51e9512b7e9471e1a09c977fca2bf12e48
Felipe Leme [Thu, 18 Jan 2018 21:38:24 +0000 (13:38 -0800)]
Minor API changes on Autofill Field Classification:
- Removed Scores class and use float[][] directly.
- Created constant for metadata keys.
- Removed getAlgorithName() from FieldClassification.
Bug:
70291841
Test: m -j update-api
Test: atest CtsAutoFillServiceTestCases
Change-Id: I62abf93c4f6f0804d838c7fb183c0b8bcb88a136
TreeHugger Robot [Fri, 19 Jan 2018 20:12:47 +0000 (20:12 +0000)]
Merge "similar to the samplers in batterystats, when we do diff, if the value is not monotically increasing, we should take the absolute value as the diff."
Derek Sollenberger [Fri, 12 Jan 2018 21:40:52 +0000 (16:40 -0500)]
Use ImageDecoder for BitmapDrawable
If required due to density mismatches the ImageDecoder will not
upscale the image at decode time, but instead will decode at the
bitmaps default size and upscale at draw time. This can be a
significant memory savings for low-dpi assets being used on a high-dpi
device.
However, if the provided asset has a higher dpi level than the bitmaps
default density then we will match BitmapFactories behavior and downscale
the bitmap to match the default density.
Bug:
63909536
Test: CtsGraphicsTestCases
Change-Id: I189306b7a3b706bed32bb267970ade27a57c0e7f
nharold [Fri, 19 Jan 2018 20:08:38 +0000 (20:08 +0000)]
Merge "Add Tunnel Interface APIs to IpSecManager"
am:
08d07aec50
Change-Id: I4186bdf52cc1c2c8927ca1a0dd61b71fae236e1a
Nadav Bar [Fri, 19 Jan 2018 20:05:18 +0000 (20:05 +0000)]
Merge "Enable phone apps to mute the VOICE_CALL stream"
nharold [Fri, 19 Jan 2018 19:43:17 +0000 (19:43 +0000)]
Merge "Add Tunnel Interface APIs to IpSecManager"
Michal Karpinski [Fri, 19 Jan 2018 16:28:26 +0000 (16:28 +0000)]
Add validators for all Settings.Secure settings that are backed up
A few no longer used settings were removed from SETTINGS_TO_BACKUP.
And extend the unit test to fail if new ones are added without
a validator. Also fail to boot in that case.
Ref: go/android-p-backed-up-settings
Test: atest frameworks/base/core/tests/coretests/src/android/provider/SettingsValidatorsTest.java
Bug:
64988620
Change-Id: I94b4039c9f54c341aec72b62579be3dd8bd84dbb
Robert Carr [Wed, 6 Dec 2017 21:17:07 +0000 (13:17 -0800)]
Rework stack Z-ordering promotion.
Down-boost home stack instead of up-boosting docked stack. This means
we don't have to do any assistant stack boosting so we wont have issues
with activities not being able to show on top of the assistant.
Change-Id: Iedef49a56a25fe0c6c26bfe4ef5194bcd8159c37
Fixes:
70318142
Fixes:
70675228
Fixes:
70178829
Fixes:
69553456
Fixes:
70178829
Test: Manual. ZOrderingTests. go/wm-smoke
Sudheer Shanka [Tue, 16 Jan 2018 20:01:00 +0000 (12:01 -0800)]
Load admin data in DPMS asynchronously during boot.
Bug:
71902030
Bug:
71710099
Test: atest services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java
Test: Ran boot tests - go/run-boottest
Test: manual
Change-Id: I34970c6f41877c7e3ece4843d47831374d455067
Bernardo Rufino [Fri, 19 Jan 2018 17:00:05 +0000 (17:00 +0000)]
Clear calling uid in isAppEligibleForBackup() and variant
This method is called by bmgr backupnow. Bmgr pid is not system uid.
When executing the method it fails with permission denied because it
can't bind to the transport. Before binding on-demand we haven't seen
this error because we didn't try to bind in the method, it was always
bound.
Bug:
72215413
Test: adb shell bmgr backupnow -all
Change-Id: I82ad712e893abfec4727d568ab48a49945645eb4
Kitta Koutarou [Fri, 1 Dec 2017 10:19:49 +0000 (19:19 +0900)]
Make LTE signal bar thresholds customizable with carrier configuration
Move config_lteDbmThresholds to KEY_LTE_RSRP_THRESHOLDS_INT_ARRAY
to control the LTE signal bar thresholds by carrier configuration.
Test: manual - Checked that the LTE signal bar thresholds can be
controlled by carrier config.
Test: auto - Confirmed that run
ServiceStateTrackerTest#testSignalStrength and it has no problem.
Bug:
70698348
Change-Id: Ia613663956ff00fbf299dcf69113733eae5a3458
Merged-In: Ia613663956ff00fbf299dcf69113733eae5a3458
Nancy Zheng [Fri, 19 Jan 2018 18:46:43 +0000 (18:46 +0000)]
Merge "Fix ForceAppStandbyTrackerTest."
Craig Donner [Wed, 27 Dec 2017 23:20:06 +0000 (15:20 -0800)]
Add new HardwareBuffer usages and formats.
Bug:
66900669
Test: build
Change-Id: Icbfb143073f4b1ed947ba325a3799d6748980c75
Chenjie Yu [Wed, 10 Jan 2018 17:37:10 +0000 (09:37 -0800)]
similar to the samplers in batterystats, when we do diff,
if the value is not monotically increasing, we should take
the absolute value as the diff.
Test: unit tested
Change-Id: Idd8a248b4092b1863eb8e50539f8f14b3ac9af9e
Makoto Onuki [Fri, 19 Jan 2018 18:11:01 +0000 (18:11 +0000)]
Merge "Make DEBUG_FPS_DIVISOR updatable via setting for possible experiments"
Winson Chung [Fri, 19 Jan 2018 18:08:53 +0000 (18:08 +0000)]
Merge "Fix Recents regressions"
Peiyong Lin [Thu, 18 Jan 2018 23:32:21 +0000 (15:32 -0800)]
[GLUtils] Pass the correct format into glTexImage2D and glTexSubImage2D.
Previously, the format and internal format are the same, however, per
https://www.khronos.org/registry/OpenGL-Refpages/es3.1/html/glTexImage2D.xhtml,
this is no longer the case, thus we need to convert to proper format when we
have the sized format.
BUG:
72065799
Test: none
Change-Id: Ib1f90db6692b3629928ed664e5c775adfb4f63dd
Leif Wilden [Fri, 19 Jan 2018 17:58:00 +0000 (17:58 +0000)]
Merge "Move instrumentation classes to SettingsLib to share between mobile/TV."
TreeHugger Robot [Fri, 19 Jan 2018 17:56:28 +0000 (17:56 +0000)]
Merge "Notify device owner when user is started / stopped / switched"
Florina Muntenescu [Wed, 17 Jan 2018 16:22:18 +0000 (16:22 +0000)]
Update JavaDoc for BackgroundColorSpan and ForegroundColorSpan.
Test: N/A
Bug:
72092996
Change-Id: Iec7f378557759e2fdd2969f579e1dfd4635b123a
Jean-Michel Trivi [Fri, 19 Jan 2018 17:40:36 +0000 (09:40 -0800)]
AudioService: fix deadlock between readSettings() and VSS.setAllIndexes()
Locking order is mSettingsLock -> VolumeStreamState.class
Missing sync on mSettingsLock was causing deadlock between
VolumeStreamState.setAllIndexes() and readSettings().
Mark that setAllIndexesToMax() is properly sync'd on mSettingsLock.
Bug:
72122435
Test: chance
Change-Id: I4bd4037fec290dd6ba586c7090e1b377543041ab
TreeHugger Robot [Fri, 19 Jan 2018 17:39:57 +0000 (17:39 +0000)]
Merge "Rename the dimension_in_what/condition as fields_in_what/condition in MetricConditionLink proto."
Felipe Leme [Wed, 17 Jan 2018 03:37:00 +0000 (19:37 -0800)]
Implemented getAlgorithm() and getDefaultAlgorithm() using manifest metadata.
Bug:
70939974
Test: atest CtsAutoFillServiceTestCases:FieldsClassificationTest
Change-Id: I8b7028c0acfef164b84821a9e4c99817acc838f8
TreeHugger Robot [Fri, 19 Jan 2018 17:17:24 +0000 (17:17 +0000)]
Merge "Fix regression in launch settings performance"
Nancy Zheng [Fri, 19 Jan 2018 00:29:59 +0000 (16:29 -0800)]
Fix ForceAppStandbyTrackerTest.
Bug:
72170020
Test: atest frameworks/base/services/tests/servicestests/src/com/android/server/ForceAppStandbyTrackerTest.java
Change-Id: I48c3c420a3f0586b243a33b3bb26e537461f3de7
TreeHugger Robot [Fri, 19 Jan 2018 17:10:29 +0000 (17:10 +0000)]
Merge "Allow <adopt-permissions> tag in manifest"
TreeHugger Robot [Fri, 19 Jan 2018 17:06:12 +0000 (17:06 +0000)]
Merge "Add canChildBeDraggable() method to SwipeHelper's callback"
Lorenzo Colitti [Fri, 19 Jan 2018 16:46:11 +0000 (16:46 +0000)]
Merge changes Id8776d14,Ifa291c62,I5ea9d200 am:
c48f4cb7f1 am:
b36b423230
am:
cfbf873dd1
Change-Id: I12108d96e29bfe71406106c2af950a6d6a9f8351
Lorenzo Colitti [Fri, 19 Jan 2018 16:37:44 +0000 (16:37 +0000)]
Merge changes Id8776d14,Ifa291c62,I5ea9d200 am:
c48f4cb7f1
am:
b36b423230
Change-Id: I1ac9d349850d607c5fbf4a47760bc09de1c18043
Lorenzo Colitti [Fri, 19 Jan 2018 16:30:17 +0000 (16:30 +0000)]
Merge changes Id8776d14,Ifa291c62,I5ea9d200
am:
c48f4cb7f1
Change-Id: I7a0b01cba8bdee67cffabddacb4ff5f4591cbc34
TreeHugger Robot [Fri, 19 Jan 2018 15:47:14 +0000 (15:47 +0000)]
Merge "Remove use of streams in TransportManager"
TreeHugger Robot [Fri, 19 Jan 2018 15:41:20 +0000 (15:41 +0000)]
Merge "Renamed Setting's Directory Access constants."