OSDN Git Service
Bernardo Rufino [Tue, 2 Jan 2018 15:53:44 +0000 (15:53 +0000)]
Binding on-demand #9: selectBackupTransport[Async]
Migrate selectBackupTransport()/selectBackupTransportAsync() to binding
on-demand. To mimic the bind-if-needed behavior that existed before for
selectBackupTransportAsync we now register-if-needed in the selection.
This means a new registerTransport() method was created in the
TransportManager. I intend to use this method with only few
modifications for the first-binding code.
Change-Id: I39661cff0f7b2f8a27da37905dcd93e0aa9b1178
Ref: http://go/br-binding-on-demand
Bug:
17140907
Test: m -j RunFrameworksServicesRoboTest
Test: adb shell bmgr transport <transport>, observe logs
Test: Robolectric tests for TransportManager will go in registration CL
Jack He [Wed, 3 Jan 2018 20:13:26 +0000 (12:13 -0800)]
HFP: Add APIs for set and get active device (1/3)
1. Call BluetoothHeadset.setActiveDevice(BluetoothDevice device) to set
a connected HFP/HSP device as active.
2. Listen for BluetoothHeadset.ACTION_ACTIVE_DEVICE_CHANGED intent
that will contain the latest active device (in EXTRA_DEVICE field).
If the active device could not be changed, the EXTRA_DEVICE
field could be null.
3. If setActiveDevice() is NOT in-progress, BluetoothA2dp.getActiveDevice()
can be used. If setActiveDevice() is in-progress, the result is undefined.
4. BluetoothHeadset.setActiveDevice() could be called by some other parts of
the system, so interested parties should always listen for
BluetoothHeadset.ACTION_ACTIVE_DEVICE_CHANGED intents and prepared
for active device updates.
Bug:
68951996
Test: manual
Change-Id: I22ca639a04fed7bf17df59c405ddeda90dafb8ff
(cherry picked from commit
05f4bc40743654ea501b18d70ee162a08b81b35c)
TreeHugger Robot [Mon, 8 Jan 2018 23:33:21 +0000 (23:33 +0000)]
Merge "Reconnect overview service to launcher when its package name changes"
TreeHugger Robot [Mon, 8 Jan 2018 23:09:32 +0000 (23:09 +0000)]
Merge "Renaming leftover from previous CL..."
Jeff Sharkey [Mon, 8 Jan 2018 23:01:15 +0000 (23:01 +0000)]
Merge "Sigh, people wrote tests with weird assumptions."
TreeHugger Robot [Mon, 8 Jan 2018 22:53:07 +0000 (22:53 +0000)]
Merge changes I3610bfef,I7b898f21,I32ab03b1
* changes:
Superficial improvements to ZOrderingTest.
Ensure docked divider is below always-on-top stacks.
Restore old stack Z ordering promotion.
TreeHugger Robot [Mon, 8 Jan 2018 22:38:21 +0000 (22:38 +0000)]
Merge "Keyguard slice layout fixes"
Colin Cross [Mon, 8 Jan 2018 22:28:31 +0000 (22:28 +0000)]
Merge "Remove obsolete aidl list" am:
abac8f7a86 am:
6b8fff4eb5
am:
48d6926f38 -s ours
Change-Id: I71bf710fd98e857a69163ba2302db5369aa8337a
Jack He [Mon, 8 Jan 2018 22:21:43 +0000 (22:21 +0000)]
Merge changes from topics "bt-hfp-add-set-active-device-method", "bt-system-api-annotations" am:
25259faa27 am:
d16d93361b
am:
b1ebd51c01 -s ours
Change-Id: I443bd449131bc242527229b3b238632d7ed1a8b7
Pankaj Kanwar [Mon, 8 Jan 2018 22:02:18 +0000 (22:02 +0000)]
Merge "Change warning message for roaming for DTAG."
Dan Albert [Mon, 8 Jan 2018 21:25:59 +0000 (21:25 +0000)]
Merge "Move to libc++ from stlport." am:
c6dd5f9037 am:
81da46f982
am:
eff28b5863
Change-Id: Ia45b5a174feaddff5e5839a231af18fb5bb3cb7a
Yi Kong [Mon, 8 Jan 2018 21:22:21 +0000 (21:22 +0000)]
Merge "Add virtual dtor for virtual classes" am:
27f61a94d6 am:
2d7813a4a7
am:
2807036b09
Change-Id: I3723483c2aac5580a7db3256a39eca278a3ee9fb
Colin Cross [Mon, 8 Jan 2018 21:20:44 +0000 (21:20 +0000)]
Merge "Remove obsolete aidl list" am:
abac8f7a86
am:
6b8fff4eb5
Change-Id: If5a5bf062a0fa586349763da9654b698dae0b30d
TreeHugger Robot [Mon, 8 Jan 2018 21:17:30 +0000 (21:17 +0000)]
Merge "Ignores Resources.NotFoundException when setting ViewStructure.setTestIdEntry()."
Leon Scroggins [Mon, 8 Jan 2018 21:14:50 +0000 (21:14 +0000)]
Merge "Support using ImageDecoder with ContentResolver + URI"
Jack He [Mon, 8 Jan 2018 21:13:52 +0000 (21:13 +0000)]
Merge changes from topics "bt-hfp-add-set-active-device-method", "bt-system-api-annotations" am:
25259faa27
am:
d16d93361b
Change-Id: I525cbc81c450afafd3fcedaf7b1b5e4b17a4162a
Android Build Merger (Role) [Mon, 8 Jan 2018 21:12:57 +0000 (21:12 +0000)]
Merge "Merge "Added internal API to get/set the A2DP Active Device" am:
6efee9c079 am:
e3428dae04 am:
fe73dd0542"
Pavlin Radoslavov [Mon, 8 Jan 2018 21:11:35 +0000 (21:11 +0000)]
Merge "Added internal API to get/set the A2DP Active Device" am:
6efee9c079 am:
e3428dae04
am:
fe73dd0542
Change-Id: Ibf2e9fb0a5939f45a9d21bc06b26ef719ff9c58f
Dan Albert [Mon, 8 Jan 2018 21:09:59 +0000 (21:09 +0000)]
Merge "Move to libc++ from stlport." am:
c6dd5f9037
am:
81da46f982
Change-Id: I3c7f169097ef1c4d17263893a18ad21b9dae7d49
Chavi Weingarten [Mon, 8 Jan 2018 21:09:06 +0000 (21:09 +0000)]
Merge "Allow stacks in split screen to show on lock screen."
Yi Kong [Mon, 8 Jan 2018 21:07:09 +0000 (21:07 +0000)]
Merge "Add virtual dtor for virtual classes" am:
27f61a94d6
am:
2d7813a4a7
Change-Id: I8787ff83ec93f5a8ae2e08e1af573d13750d9aa5
Pavlin Radoslavov [Mon, 8 Jan 2018 21:02:01 +0000 (21:02 +0000)]
Merge "Added internal API to get/set the A2DP Active Device" am:
6efee9c079
am:
e3428dae04
Change-Id: If220447db71398cc305eb7a702896e21959110c8
Felipe Leme [Mon, 8 Jan 2018 20:59:33 +0000 (12:59 -0800)]
Renaming leftover from previous CL...
Test: echo 'In TreeHugger we trust!'
Bug:
71552872
Change-Id: I2b317c28cb7ec0e74b2cfa98338f9d64ff7dce3b
Robert Carr [Thu, 4 Jan 2018 02:26:04 +0000 (18:26 -0800)]
Superficial improvements to ZOrderingTest.
Looks a little cleaner like this. Mainly removed
the common mTransaction argument to the assertion function and
renamed it. Also added a helper for repeatedly passed args to create
windows.
Test: Test?
Change-Id: I3610bfefd7f193169930b97d3bf9e635b967cb17
Robert Carr [Thu, 4 Jan 2018 02:07:51 +0000 (18:07 -0800)]
Ensure docked divider is below always-on-top stacks.
We need interleave it with the AppWindowToken hierarchy even
though it only has a WindowToken.
Fixes:
70318142
Fixes:
70675228
Fixes:
70178829
Test: Manual. ZOrderingTests.
Change-Id: I7b898f2157de85433416579efae5e01a9dcbf46c
TreeHugger Robot [Mon, 8 Jan 2018 20:53:24 +0000 (20:53 +0000)]
Merge "Remove app icon from USB dialogs"
Yi Jin [Mon, 8 Jan 2018 20:52:54 +0000 (20:52 +0000)]
Merge "Implement a new type of section which reads from logd and dumps proto."
Matthew Ng [Mon, 8 Jan 2018 20:50:27 +0000 (12:50 -0800)]
Reconnect overview service to launcher when its package name changes
Listen for broadcast intent filter ACTION_PACKAGE_ADDED to reconnect the
connection from overview to launcher.
Test: manual - enable/disable feature from launcher settings
Bug:
67957962
Change-Id: Ic069498ec2036bcb6ab6d95002d5c34027395360
Steven Moreland [Mon, 8 Jan 2018 20:44:51 +0000 (20:44 +0000)]
Merge "Generic Mutable class for HIDL code." am:
0f05ce94c3 am:
a4ac12c3ac
am:
98fa8b7eb0
Change-Id: I0062c37e0fe119ee31b8c72396e2be706a6469a5
Jeff Sharkey [Mon, 8 Jan 2018 20:38:43 +0000 (13:38 -0700)]
Sigh, people wrote tests with weird assumptions.
They're mocking a mock. Nelson called.
Test: bit FrameworksTelephonyTests:com.android.internal.telephony.ServiceStateTrackerTest
Bug:
71707742
Change-Id: I30db29808fb22ade2247446782ee1ec3d4b947cb
Jack He [Mon, 8 Jan 2018 20:34:04 +0000 (20:34 +0000)]
Merge "Bluetooth: Remove strings for enabling inband ringing" am:
02a0397643 am:
37f987d7ee
am:
8637bb7e46 -s ours
Change-Id: I8cf5acfb36a041a62b6be1b5af6ef77c9bc3e036
nharold [Mon, 8 Jan 2018 20:29:11 +0000 (20:29 +0000)]
Merge changes from topic "ipsec-resource-id-cleanup" am:
2b36299c73 am:
d7319df4d0
am:
a07d0e463d
Change-Id: Ib96b30bcb1b47c23d0a18cf043dd042409c61322
Steven Moreland [Mon, 8 Jan 2018 20:25:30 +0000 (20:25 +0000)]
Merge "Generic Mutable class for HIDL code." am:
0f05ce94c3
am:
a4ac12c3ac
Change-Id: I1914e805b15064b40b963840eddf87a0bbd41169
Jack He [Mon, 8 Jan 2018 20:20:19 +0000 (20:20 +0000)]
Merge "Bluetooth: Remove strings for enabling inband ringing" am:
02a0397643
am:
37f987d7ee
Change-Id: I2d5a62b3eb22bd10c350495726307674107778b4
nharold [Mon, 8 Jan 2018 20:16:08 +0000 (20:16 +0000)]
Merge changes from topic "ipsec-resource-id-cleanup" am:
2b36299c73
am:
d7319df4d0
Change-Id: If6ab575e2f30fc70d73e6f8787c87f3c7a2ab09d
TreeHugger Robot [Mon, 8 Jan 2018 20:00:28 +0000 (20:00 +0000)]
Merge "Insert org.apache.http.legacy at the start of the shared library list"
TreeHugger Robot [Mon, 8 Jan 2018 19:54:27 +0000 (19:54 +0000)]
Merge "Dump a few more bits of history about TIME_TICK"
TreeHugger Robot [Mon, 8 Jan 2018 19:53:21 +0000 (19:53 +0000)]
Merge "Exit split-screen when primary stack moved behind a fullscreen stack."
Ram Periathiruvadi [Mon, 8 Jan 2018 19:41:51 +0000 (19:41 +0000)]
Merge "Add a hidden API to inject location."
Felipe Leme [Mon, 8 Jan 2018 17:49:15 +0000 (09:49 -0800)]
Ignores Resources.NotFoundException when setting ViewStructure.setTestIdEntry().
Test: manual verification using com.facebook.katana
Fixes:
71695541
Change-Id: Idefc7d3799f2ef5525a5050d63ca29a19cab730a
Christopher Tate [Fri, 5 Jan 2018 00:10:26 +0000 (16:10 -0800)]
EventLog when an executed job had been deferred by standby
This gives us a way to review the impact of the deferral on jobs'
nominal timeliness.
Bug:
70297451
Test: manual
Change-Id: I0b5caab6ac7157aab1524f7b014e521f34400e1d
Chris Tate [Mon, 8 Jan 2018 19:25:31 +0000 (19:25 +0000)]
Merge "Jobs now ignore standby bucketing while device is in parole"
chaviw [Fri, 5 Jan 2018 01:05:05 +0000 (17:05 -0800)]
Allow stacks in split screen to show on lock screen.
The change in ag/
3345710 prevented all non full screen stacks from
showing on lock screen. Instead allow split screen and full screen
stack to show on lock screen. Split screen stacks will become full
screen when shown on lock screen.
Fixes:
70919978
Test: Put an app into split screen. Lock screen. Receive a phone call.
Screen will now properly turn on and show dialer in full screen.
Change-Id: I3759cb4b68a7bdad478b5b603b19140965a24b61
TreeHugger Robot [Mon, 8 Jan 2018 19:06:11 +0000 (19:06 +0000)]
Merge "ScanResult: Add radio chain information"
TreeHugger Robot [Mon, 8 Jan 2018 19:05:07 +0000 (19:05 +0000)]
Merge "Make sure updateSurfaceSize gets applied after changing config"
TreeHugger Robot [Mon, 8 Jan 2018 18:59:45 +0000 (18:59 +0000)]
Merge "Remove all references to FDE enable wipe"
Lucas Dupin [Sat, 6 Jan 2018 01:02:43 +0000 (17:02 -0800)]
Keyguard slice layout fixes
Fixes a series of line break and text layout issues.
Now we have proper text length limit and ellipsize it
correctly.
Change-Id: Idf915b56ee6ee923ce4f1cc21a0c57ff5d0a99ca
Fixes:
71634498
Fixes:
71599239
Fixes:
71476950
Fixes:
71576197
Test: Visual
Patrick Baumann [Mon, 8 Jan 2018 18:56:40 +0000 (18:56 +0000)]
Merge "Move signing data into SigningDetails container"
Bryce Lee [Fri, 5 Jan 2018 17:00:49 +0000 (09:00 -0800)]
Exit split-screen when primary stack moved behind a fullscreen stack.
Activities can request their task be moved to the back of the stack,
which subsequently causes the stack to move as well. When the stack
is a split screen primary stack, this causes an ordering issue where
the secondary will not move back while a fullscreen stack has moved
in front of the primary. This leads to further ordering issues once
the front secondary is dismissed as other stacks are also in the
secondary windowing mode.
To address this issue, we exit split-screen mode when the primary
split-screen stack is moved back.
Test: atest ActivityStackTests#testPrimarySplitScreenToFullscreenWhenMovedToBack
Change-Id: Ic0597831e046a254b3cba216e1cb2fb11191f2c6
Fixes:
69662547
TreeHugger Robot [Mon, 8 Jan 2018 18:05:39 +0000 (18:05 +0000)]
Merge "Log vibrations in realtime, not the monotonic clock base."
Leon Scroggins III [Mon, 11 Dec 2017 18:47:23 +0000 (13:47 -0500)]
Support using ImageDecoder with ContentResolver + URI
Bug:
63909536
Test: CTS: I0f36ce34c968fd7fae4d8edebabea3a421859615
Add ImageDecoder.createSource(ContentResolver, URI), allowing a client
to decode images from files, content, resources, etc.
Prefer using a file descriptor to using an InputStream so the input can
be cheaply seeked and rewound if necessary.
Make ImageDecoder implement AutoCloseable to handle closing the input.
Make decodeDrawable/decodeBitmap always return an object or throw an
IOException. Avoid checking for a file in the Source constructor.
Fix a bug where inner Exception classes were not static.
Update JavaInputStreamAdaptor to be usable by ImageDecoder:
- previously it always swallowed exceptions. Allow them to propagate
(optionally) so that they can be reported back to the client.
- Add refs to the InputStream and byte[]. ImageDecoder returns from
native and then uses the JavaInputStreamAdaptor again, making the
local refs go out of scope.
- Hold on to the JavaVM and convert to the JNIEnv when necessary. Pass
local env pointers to avoid looking it up multiple times in one call.
- If an exception is thrown inside the doRead() loop, return the number
of bytes successfully read.
Change-Id: I869dad55521cf942efd010c06baf3f44c1c08374
Jorim Jaggi [Mon, 8 Jan 2018 17:19:54 +0000 (17:19 +0000)]
Merge "Fix canAffectSystemUiFlags"
Roshan Pius [Fri, 27 Oct 2017 22:12:51 +0000 (15:12 -0700)]
ScanResult: Add radio chain information
On devices with multiple radio chains, each scan result could be
received using different combination of the available radio chains
(DBS, MCC). Add a new parameter in the scan result to convey this meta
information about the scan result.
Bug:
68335251
Test: Unit tests
Change-Id: I1fc97745b9e74b768b67b0c80e52ce4a13e69527
Jorim Jaggi [Mon, 8 Jan 2018 17:13:50 +0000 (17:13 +0000)]
Merge "Make sure app transition are started simultaneously"
Jorim Jaggi [Mon, 8 Jan 2018 17:05:23 +0000 (17:05 +0000)]
Merge "Revert "Avoid setting size/position on Transaction if not needed""
Paul Duffin [Mon, 2 Oct 2017 10:16:25 +0000 (11:16 +0100)]
Insert org.apache.http.legacy at the start of the shared library list
Ensure consistent behaviour depending on whether OAHL is on the
bootclasspath or not.
When OAHL is on the bootclasspath the search order is (where ... is the
other libraries on the bootclasspath):
OAHL
...
shared libraries
optional shared libraries
APK
Prior to this change the OAHL was added to the end of the shared
library list which meant the search order (when OAHL is not on the
bootclasspath) would be:
...
shared libraries
OAHL
optional shared libraries
APK
After this change the order will be:
...
OAHL
shared libraries
optional shared libraries
APK
The slight difference at the beginning is not an issue because there are
no conflicting resources or class files between OAHL and the other boot
libraries.
Bug:
65552462
Bug:
18027885
Test: build, flash, check systrace when starting GoogleDialer
Change-Id: Ifcb4d50c13e35eebac4d18f8f0f10dd0734e8896
Paul Duffin [Mon, 8 Jan 2018 16:46:39 +0000 (16:46 +0000)]
Merge "Remove unused target legacy.test.stubs"
Jorim Jaggi [Mon, 8 Jan 2018 16:33:30 +0000 (17:33 +0100)]
Revert "Avoid setting size/position on Transaction if not needed"
Reason: Causes weird issues with transaction reordering
Fixes:
71694437
Fixes:
71692657
This reverts commit
88f620534f9fe2c3a32765b2a34d3092ab889b1a.
Jorim Jaggi [Mon, 8 Jan 2018 16:33:08 +0000 (16:33 +0000)]
Merge "Fix window move animation duration scale"
Jorim Jaggi [Mon, 8 Jan 2018 15:23:00 +0000 (16:23 +0100)]
Make sure updateSurfaceSize gets applied after changing config
Otherwise we'll apply the old size.
Test: Rotate screen, make sure size is correct.
Test: go/wm-smoke
Change-Id: Ic9474952801241a16c344175104ec2b5d45e7ec8
Ram Periathiruvadi [Sat, 9 Dec 2017 02:35:10 +0000 (18:35 -0800)]
Add a hidden API to inject location.
New API allows system clients with LOCATION_HARDWARE and
ACCESS_FINE_LOCATION to inject a location to the Location Manager. This
is useful in products like Auto, where the location needs to be cached
across reboots.
Bug: b/
64125396
Test: Foll. were tested:
1. location can be injected when lastLocation is not available
2. location cannot be injected when lastLocation is already available
Also, tested location availability on different devices for sanity.
Change-Id: I1fd060caafed0431074ae64439ac52e99e0d6032
TreeHugger Robot [Mon, 8 Jan 2018 16:18:50 +0000 (16:18 +0000)]
Merge "Add null checking in onUidRemovedLocked"
Michael Wright [Mon, 8 Jan 2018 15:54:05 +0000 (15:54 +0000)]
Log vibrations in realtime, not the monotonic clock base.
Also, keep more vibration logs around for debugging by default and do a
bit of clean up in VibratorService.
Bug:
70283106
Test: flash, run dumpsys vibrator
Change-Id: Ib541be0ed97cdc6e2fda278fa59896d2fde20228
Jorim Jaggi [Fri, 5 Jan 2018 17:28:36 +0000 (18:28 +0100)]
Make sure app transition are started simultaneously
Test: go/wm-smoke
Test: Lock device in split screen, make sure everything is
absolutely synchronized when unlocking
Bug:
64674361
Change-Id: I25352d7a6b8beb9729310dd525710dca20a78166
Tony Mak [Mon, 8 Jan 2018 14:35:34 +0000 (14:35 +0000)]
Add null checking in onUidRemovedLocked
Bug:
71697620
Test: cts-tradefed run cts-dev --module DevicePolicyManager --test com.android.cts.devicepolicy.CrossProfileAppsHostSideTest
Change-Id: I6d7f70c01ab3d6b077ffeb9a076d46159a633682
TreeHugger Robot [Mon, 8 Jan 2018 13:50:50 +0000 (13:50 +0000)]
Merge "Clean-up brightness configuration."
Jorim Jaggi [Mon, 8 Jan 2018 13:38:53 +0000 (14:38 +0100)]
Fix window move animation duration scale
Test: go/wm-smoke
Test: Adjust duration scale, observe windows are moving slower
Change-Id: Iac08be3341c5f80b2723bee23f974ebebdcd07fa
Fixes:
71683150
Jorim Jaggi [Mon, 8 Jan 2018 12:16:59 +0000 (13:16 +0100)]
Fix canAffectSystemUiFlags
While trying to simplify the method, a bit too much was
simplified. We still need the translucent check in all cases.
Test: go/wm-smoke
Test: WindowStateTests
Change-Id: Ibd4275ddb80a9ef768a0c39ac53a9edeea431411
Fixes:
71512667
Jorim Jaggi [Mon, 8 Jan 2018 12:02:07 +0000 (12:02 +0000)]
Merge "Copy child window list when destroying surface"
TreeHugger Robot [Mon, 8 Jan 2018 11:45:49 +0000 (11:45 +0000)]
Merge "Start BackupManagerConstants content observer"
Bartosz Fabianowski [Fri, 5 Jan 2018 10:56:26 +0000 (11:56 +0100)]
Start BackupManagerConstants content observer
BackupManagerConstants has a content observer that is meant to be
notified whenever backup settings change. However, that observer is
never registered.
Bug:
71622864
Test: cts-tradefed run cts-dev --module CtsBackupHostTestCase
Change-Id: Icbd90ef3af83dd2f29e26a5d787505bcf5681154
Alan Stokes [Mon, 8 Jan 2018 09:48:43 +0000 (09:48 +0000)]
Merge "Tidy up DexLoggerIntegrationTests."
Peter Visontay [Mon, 8 Jan 2018 09:12:44 +0000 (09:12 +0000)]
Merge "Add AndroidTest.xml for privacy tests."
TreeHugger Robot [Mon, 8 Jan 2018 07:33:19 +0000 (07:33 +0000)]
Merge "Parameter to hide bottom affordances"
TreeHugger Robot [Mon, 8 Jan 2018 06:30:57 +0000 (06:30 +0000)]
Merge "[RTT2] Clean-up the RTT service name"
Jeff Sharkey [Mon, 8 Jan 2018 02:08:17 +0000 (02:08 +0000)]
Merge "Add DataUnit to clarify SI-vs-IEC units."
Jeff Sharkey [Sun, 7 Jan 2018 23:47:31 +0000 (16:47 -0700)]
Add DataUnit to clarify SI-vs-IEC units.
Mirrors the design of TimeUnit and ChronoUnit which many developers
are already familiar with, making it easy to pick up and use.
Yes, this is an enum.
Bug:
70915728
Test: bit FrameworksCoreTests:android.util.DataUnitTest
Change-Id: Id0cfdac5c81ed89c3c9ece23c964acba4a4f8471
pkanwar [Thu, 4 Jan 2018 02:41:18 +0000 (18:41 -0800)]
Change warning message for roaming for DTAG.
Bug:
64106612
Test: manual
Change-Id: I9fee99d4f08521727466c2480dce0aff3a395fe3
TreeHugger Robot [Sun, 7 Jan 2018 23:09:27 +0000 (23:09 +0000)]
Merge "Notifier: Chained attribution support for noteLongPartialWakeLock[finish|start]"
Yi Jin [Sat, 23 Dec 2017 01:36:47 +0000 (17:36 -0800)]
Implement a new type of section which reads from logd and dumps proto.
And implement a file section which reads from event-log-tags for
decoding binary logs.
Bug:
70936599
Test: atest incidentd_test && atest incident_helper_test and flush on
device and test log sections and event_log_tag_map
Change-Id: Ib3d35e317f355de69f01ded012482486e9a43da6
TreeHugger Robot [Sat, 6 Jan 2018 21:28:23 +0000 (21:28 +0000)]
Merge "Add permission necessary to use RecoverableKeyStoreLoader API."
Robert Berry [Sat, 6 Jan 2018 19:16:25 +0000 (19:16 +0000)]
Add API to remove recoverable keys
Test: adb shell am instrument -w -e package com.android.server.locksettings.recoverablekeystore com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Change-Id: Ib69e730467974d34ffe4a700bd6aaf4543a524ae
TreeHugger Robot [Sat, 6 Jan 2018 18:41:05 +0000 (18:41 +0000)]
Merge "Check the public key bytes of veriferPublicKey matche the ones in vaultParams"
Colin Cross [Sat, 6 Jan 2018 17:56:13 +0000 (17:56 +0000)]
Merge "Remove obsolete aidl list"
am:
abac8f7a86
Change-Id: If4b2f5693947dfd8d35531d7a399b7f3d764506f
Jack He [Sat, 6 Jan 2018 17:51:45 +0000 (17:51 +0000)]
Merge changes from topics "bt-hfp-add-set-active-device-method", "bt-system-api-annotations"
am:
25259faa27
Change-Id: Ife08cbcb0490f55c81f239f96aef6e8e2a02e8d3
Dan Albert [Sat, 6 Jan 2018 17:47:49 +0000 (17:47 +0000)]
Merge "Move to libc++ from stlport."
am:
c6dd5f9037
Change-Id: Ie42f0cf03a005215b96bbbef16ea62e541fb12a8
Yi Kong [Sat, 6 Jan 2018 17:44:50 +0000 (17:44 +0000)]
Merge "Add virtual dtor for virtual classes"
am:
27f61a94d6
Change-Id: Ic45e81f483e31b01abe6195bd63174c8253b82ae
Pavlin Radoslavov [Sat, 6 Jan 2018 17:41:05 +0000 (17:41 +0000)]
Merge "Added internal API to get/set the A2DP Active Device"
am:
6efee9c079
Change-Id: I5e82a41c4bcf546bdc8fd08c56103c333745c60c
Steven Moreland [Sat, 6 Jan 2018 17:37:23 +0000 (17:37 +0000)]
Merge "Generic Mutable class for HIDL code."
am:
0f05ce94c3
Change-Id: I8ee4b650b96279efe26bdacb4d09a6a0317960e7
Jack He [Sat, 6 Jan 2018 17:32:38 +0000 (17:32 +0000)]
Merge "Bluetooth: Remove strings for enabling inband ringing"
am:
02a0397643
Change-Id: Id6c9ab4a230e5c242402f78212f21943e1a7604f
nharold [Sat, 6 Jan 2018 17:29:12 +0000 (17:29 +0000)]
Merge changes from topic "ipsec-resource-id-cleanup"
am:
2b36299c73
Change-Id: I5461b0e0746f8c60b425126d9badbae4630395bb
Paul Duffin [Fri, 5 Jan 2018 16:04:44 +0000 (16:04 +0000)]
Remove unused target legacy.test.stubs
This target is no longer used so can be safely removed.
Bug:
30188076
Test: make checkbuild
Change-Id: Id15d6916c33647d56cb85bbc4cc926c89ff3d4bd
TreeHugger Robot [Sat, 6 Jan 2018 04:37:59 +0000 (04:37 +0000)]
Merge "Fix a few things with the loadtest app."
Lucas Dupin [Sat, 6 Jan 2018 04:29:24 +0000 (04:29 +0000)]
Turn default gradient into solid black am:
12dad0c4fc
am:
555e680089 -s ours
Change-Id: Ieafc75f5f6d7aeb05b4a03cdd83cf48ece650b69
Lucas Dupin [Sat, 6 Jan 2018 03:34:46 +0000 (03:34 +0000)]
Turn default gradient into solid black
am:
12dad0c4fc
Change-Id: I6f5c702487f46395bd1930d943782d1a9b6bac5d
TreeHugger Robot [Sat, 6 Jan 2018 03:31:24 +0000 (03:31 +0000)]
Merge "Turn on Settings security settings v2."
Treehugger Robot [Sat, 6 Jan 2018 02:50:58 +0000 (02:50 +0000)]
Merge "Remove obsolete aidl list"
Christopher Tate [Sat, 6 Jan 2018 02:40:14 +0000 (18:40 -0800)]
Dump a few more bits of history about TIME_TICK
Bug:
70670726
Test: manual
Change-Id: I7d593da8ec236b505bbdba3ece0a638cc41388c2
Colin Cross [Thu, 4 Jan 2018 22:59:10 +0000 (14:59 -0800)]
Remove obsolete aidl list
Remove the obsolete aidl list, framework.aidl is now generated
from the stubs jars.
Bug:
70046217
Test: m checkbuild
Change-Id: I2417f0a8f193bd4db4058f6f0bb05c147e18de25
Merged-In: I2417f0a8f193bd4db4058f6f0bb05c147e18de25
(cherry picked from commit
fac48f998e763060dfdfb6e76927ec85aa63e1eb)
TreeHugger Robot [Sat, 6 Jan 2018 01:30:21 +0000 (01:30 +0000)]
Merge "pullers now cache data to throttle frequent pull requests. all pullers have a default 1s cool down before next pull. We can adjust these later. Also add puller stats in StatsdStats"