OSDN Git Service
Alan Viverette [Thu, 2 Feb 2017 20:58:05 +0000 (15:58 -0500)]
Clean up DialogInterface lint warnings, docs, ws
Change-Id: I7a40bf87373e755092bbcf9a38fef35bf745aa12
Test: no functional changes
Julia Reynolds [Tue, 31 Jan 2017 14:06:03 +0000 (14:06 +0000)]
Merge "Use TVExtender channel on tv platforms."
Bill Yi [Tue, 31 Jan 2017 08:42:40 +0000 (08:42 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
21e0ccb1a6 -s ours
am:
eccb4c5045 -s ours
Change-Id: I1132a94369c09f75e1f961ffe9ee90a71996c013
Bill Yi [Tue, 31 Jan 2017 08:41:41 +0000 (08:41 +0000)]
Import translations. DO NOT MERGE am:
652182376c -s ours
am:
1b49042a6a -s ours
Change-Id: I511fbfdc62022fd75a5690e789c8e19c51ad5ced
Bill Yi [Tue, 31 Jan 2017 08:37:44 +0000 (08:37 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
21e0ccb1a6 -s ours
Change-Id: I12a3340aaa49277aba78c7dcc51b063458113262
Bill Yi [Tue, 31 Jan 2017 08:37:39 +0000 (08:37 +0000)]
Import translations. DO NOT MERGE
am:
652182376c -s ours
Change-Id: I45c84e6031609830111e915ab692906fc48ff0d6
TreeHugger Robot [Tue, 31 Jan 2017 08:31:11 +0000 (08:31 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Tue, 31 Jan 2017 08:02:40 +0000 (08:02 +0000)]
Merge "Import translations. DO NOT MERGE"
Bill Yi [Tue, 31 Jan 2017 07:39:56 +0000 (07:39 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
f3db881c0c -s ours
am:
b02ba73c7d -s ours
Change-Id: Id437d7da4c74788afe857ea09ae9974cf77c8132
Bill Yi [Tue, 31 Jan 2017 07:39:01 +0000 (07:39 +0000)]
Import translations. DO NOT MERGE am:
85f7e3989c -s ours
am:
c90971e335 -s ours
Change-Id: I5dd2cda575ce68aaf7a188a1b75f02191a40fefd
Bill Yi [Tue, 31 Jan 2017 07:38:09 +0000 (07:38 +0000)]
Import translations. DO NOT MERGE am:
e924e16c3d -s ours
am:
c207d2686e -s ours
Change-Id: I76243ce4d943a2e01740260d84c1c0b04a415b4a
Bill Yi [Tue, 31 Jan 2017 07:34:40 +0000 (07:34 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
f3db881c0c -s ours
Change-Id: I86910f68247dbb886e7f3b4b646cf0d8fd8e686a
Bill Yi [Tue, 31 Jan 2017 07:34:33 +0000 (07:34 +0000)]
Import translations. DO NOT MERGE
am:
85f7e3989c -s ours
Change-Id: Ibcafecde0ae6b531d5e6c1f379372ad8c73e41fa
Bill Yi [Tue, 31 Jan 2017 07:33:35 +0000 (07:33 +0000)]
Import translations. DO NOT MERGE
am:
e924e16c3d -s ours
Change-Id: I90ef4192992b588b600f76c90b8744fc52eeb9e8
TreeHugger Robot [Tue, 31 Jan 2017 07:30:44 +0000 (07:30 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Tue, 31 Jan 2017 07:30:04 +0000 (07:30 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Tue, 31 Jan 2017 07:29:27 +0000 (07:29 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Tue, 31 Jan 2017 07:28:41 +0000 (07:28 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
Bill Yi [Tue, 31 Jan 2017 06:39:49 +0000 (22:39 -0800)]
Import translations. DO NOT MERGE
Change-Id: I0ef2e2fb59b03df8ce1c4ebb29154ef815b6154b
Auto-generated-cl: translation import
Bill Yi [Tue, 31 Jan 2017 06:29:14 +0000 (22:29 -0800)]
Import translations. DO NOT MERGE
Change-Id: I0f109486ea3b8c2c2fb21d796aa1d546e8fc3f68
Auto-generated-cl: translation import
Hugo Benichi [Tue, 31 Jan 2017 06:16:43 +0000 (06:16 +0000)]
Merge "ApfTest: fix flaky testApfFilterRa." am:
c2e8588396 am:
60e1375f79 am:
811f6c86da
am:
488ffdc784
Change-Id: Ib4223b548b434211dda4e750f660eb68a30a9d96
Hugo Benichi [Tue, 31 Jan 2017 06:11:35 +0000 (06:11 +0000)]
Merge "ApfTest: fix flaky testApfFilterRa." am:
c2e8588396 am:
60e1375f79
am:
811f6c86da
Change-Id: Idd738e1a4c9f0a865f5b84270535a94c492341ce
Hugo Benichi [Tue, 31 Jan 2017 06:07:08 +0000 (06:07 +0000)]
Merge "ApfTest: fix flaky testApfFilterRa." am:
c2e8588396
am:
60e1375f79
Change-Id: Ied249e20ffc80728d20ac1e5442d45f5cb767776
Hugo Benichi [Tue, 31 Jan 2017 06:01:58 +0000 (06:01 +0000)]
Merge "ApfTest: fix flaky testApfFilterRa."
am:
c2e8588396
Change-Id: I79c3ec0ba35973cc0dd32709447b2cc30e790d08
Hugo Benichi [Tue, 31 Jan 2017 05:53:51 +0000 (05:53 +0000)]
Merge "ApfTest: fix flaky testApfFilterRa."
TreeHugger Robot [Tue, 31 Jan 2017 05:46:23 +0000 (05:46 +0000)]
Merge "Introduce set/getFontVariationSettings."
Edwin Wong [Tue, 31 Jan 2017 05:03:40 +0000 (05:03 +0000)]
Merge "Pass application packagename to drm plugin."
Bill Yi [Tue, 31 Jan 2017 04:45:03 +0000 (20:45 -0800)]
Import translations. DO NOT MERGE
Change-Id: Icf17a6fb6b941caea8a843c0cac96f0b1883d4f3
Auto-generated-cl: translation import
Bill Yi [Tue, 31 Jan 2017 04:36:40 +0000 (20:36 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ifb3e58e4528c1d7ea44bac121b7e210672aa6a7f
Auto-generated-cl: translation import
Bill Yi [Tue, 31 Jan 2017 03:41:51 +0000 (19:41 -0800)]
Import translations. DO NOT MERGE
Change-Id: I8898f88d0454aa0065faa8e0cbc737a5dc2cc055
Auto-generated-cl: translation import
Bill Yi [Tue, 31 Jan 2017 03:21:33 +0000 (19:21 -0800)]
Import translations. DO NOT MERGE
Change-Id: I51010554d0b8e46a3b4541bdce9323cfb01e107d
Auto-generated-cl: translation import
TreeHugger Robot [Tue, 31 Jan 2017 03:17:45 +0000 (03:17 +0000)]
Merge "Add instant cookie APIs"
Bill Yi [Tue, 31 Jan 2017 03:13:28 +0000 (19:13 -0800)]
Import translations. DO NOT MERGE
Change-Id: If8563cdf20d35e212c7c1a25636973b1da634e12
Auto-generated-cl: translation import
TreeHugger Robot [Tue, 31 Jan 2017 02:54:35 +0000 (02:54 +0000)]
Merge "Add new api ClipDescription.getTimestamp."
TreeHugger Robot [Tue, 31 Jan 2017 02:47:25 +0000 (02:47 +0000)]
Merge "Add user picker for anchored window. Test: CtsAutoFillServiceTestCases"
Hugo Benichi [Mon, 19 Dec 2016 05:50:52 +0000 (14:50 +0900)]
ApfTest: fix flaky testApfFilterRa.
testApfFilterRa is failing with probabiliy 1/10 ~ 1/15 on the following
assert: assertDrop(program, packet, lifetime/6), for lifetime values
that are multiple of 6, where 6 is the hardcoded fraction of RA lifetime
to filter in ApfFilter.java.
When the lifetime is not a multiple of 6, the remainder of 1 to 5
seconds gives enough margin so that when the APF program is simulated
the faked lifetime of the program is less than lifetime/6 away and the
packet is dropped.
However for lifetimes which are exact multiples of 6, this margin is
always 0s and that result in nondeterminism in the result. This is
consistent with the obervation that the only failed assert was for a
lifetime of 300s, the only multiple of 6.
This can be observed by detecting the age limit at which the filter
stops dropping packet oscillating between lifetime/6 and lifetime/6 + 1
for lifetimes which are multiple of 6.
This patch fixes the flakyness by freezing the flow of time in tests so
that the expected filter age threshold is consistent and stable.
Test: no failure observed in 1000 runs.
Bug:
32561414
Change-Id: I5251d047039f34b82ce8a5d20ae46563e1e0cce8
Dianne Hackborn [Tue, 31 Jan 2017 01:55:54 +0000 (01:55 +0000)]
Merge "Remove some unused code around process state reporting."
TreeHugger Robot [Tue, 31 Jan 2017 01:53:13 +0000 (01:53 +0000)]
Merge "Minor updates to reflect libbinder changes."
Svetoslav Ganov [Tue, 31 Jan 2017 00:34:13 +0000 (16:34 -0800)]
Add instant cookie APIs
This change adds APIs for instant apps to store cookie data
that is presisted across instant installs and across the
upgrade from an instant to a standard app. Standard apps
can use the cookie APIs but when they are uninstalled the
cookie is also deleted. The cookies are kept longer than
the instant apps as they are much smaller - 16KB by default.
We can change the cookie size via a system setting i.e.
after we ship we can increase size if needed.
We also add internal APIs to surface information about
installed and uninstalled instant apps which should be
used for showing them in the UI. For this puporse we store
the icon, permissions, and label of uninstalled apps. If
the app is re-installed we drop this meta-data but keep
the cookie around. If we have cookie data stored and the
signing cert of the app changes when it gets re-intalled
we wipe the cookie.
Test: CTS tests pass; hiddent APIs tested manually
Change-Id: If145c0440cc61a5303e2cbb70228d235d36037a5
Etan Cohen [Tue, 31 Jan 2017 01:45:23 +0000 (01:45 +0000)]
Merge "[AWARE] Minor hardening of manager." am:
d0f1c9d1d3 am:
155d9ba6fc am:
3e8f90a62b
am:
4717b99a9d
Change-Id: Ia87571d271f0dd271b40445b14bba9d05f5b34f1
Etan Cohen [Tue, 31 Jan 2017 01:40:49 +0000 (01:40 +0000)]
Merge "[AWARE] Minor hardening of manager." am:
d0f1c9d1d3 am:
155d9ba6fc
am:
3e8f90a62b
Change-Id: Ia909905095094f33c536774235d49060ca2d63c3
Etan Cohen [Tue, 31 Jan 2017 01:36:18 +0000 (01:36 +0000)]
Merge "[AWARE] Minor hardening of manager." am:
d0f1c9d1d3
am:
155d9ba6fc
Change-Id: I222a30730ec6199a53c91fb6c3fd4b96846ac7d3
Etan Cohen [Tue, 31 Jan 2017 01:30:24 +0000 (01:30 +0000)]
Merge "[AWARE] Minor hardening of manager."
am:
d0f1c9d1d3
Change-Id: I182e8c10eea318cf1fd3d3fe4da3275df01f851d
Fyodor Kupolov [Tue, 31 Jan 2017 01:19:51 +0000 (01:19 +0000)]
Merge "Read SystemConfig on a worker thread"
Etan Cohen [Tue, 31 Jan 2017 01:19:48 +0000 (01:19 +0000)]
Merge "[AWARE] Minor hardening of manager."
Sudheer Shanka [Wed, 18 Jan 2017 21:37:02 +0000 (13:37 -0800)]
Add new api ClipDescription.getTimestamp.
ClipDescription.getTimestamp can be used to know the time
at which the associated ClipData is copied to global clipboard.
Bug:
30873580
Test: cts-tradefed run singleCommand cts-dev --module CtsContentTestCases -t \
android.content.cts.ClipDescriptionTest
Change-Id: I9486ab3fe0696959d42f6b4c98e40f5becee3019
Jason Long [Fri, 27 Jan 2017 23:21:12 +0000 (15:21 -0800)]
Add user picker for anchored window.
Test: CtsAutoFillServiceTestCases
Bug:
34633695
Change-Id: I274264846358941983183a32f07cade3b26c8c05
Android Build Merger (Role) [Tue, 31 Jan 2017 01:16:32 +0000 (01:16 +0000)]
Merge "Merge changes I8eca5f24,I9d79c67c am:
54604d9143 am:
276672d192 am:
5445bdda28 am:
b67f853f6f"
Jerry Zhang [Tue, 31 Jan 2017 01:15:55 +0000 (01:15 +0000)]
Merge changes I8eca5f24,I9d79c67c am:
54604d9143 am:
276672d192 am:
5445bdda28
am:
b67f853f6f
Change-Id: I841123c2ba343a1ff1d0205c239ada0b54622988
Android Build Merger (Role) [Tue, 31 Jan 2017 01:15:24 +0000 (01:15 +0000)]
Merge changes from topic 'am-
7c11f830c3cc4f4994e740cad00a8e97'
* changes:
Check and send usb state broadcast when devices boots am:
af6d473ab0 am:
061bceafee am:
df1df40f91 am:
307a387f38
Only send usb disconnect intents after boot. am:
c1bc0a844d am:
dc9c094deb am:
9877c70d9d am:
1064ee66d5
TreeHugger Robot [Tue, 31 Jan 2017 01:14:40 +0000 (01:14 +0000)]
Merge "Define targetSandboxVersion"
Badhri Jagan Sridharan [Tue, 31 Jan 2017 01:14:33 +0000 (01:14 +0000)]
Check and send usb state broadcast when devices boots am:
af6d473ab0 am:
061bceafee am:
df1df40f91
am:
307a387f38
Change-Id: Icf4b4e4f48fea450b71bd7ccd88db7d089ea286e
Jerry Zhang [Tue, 31 Jan 2017 01:13:20 +0000 (01:13 +0000)]
Only send usb disconnect intents after boot. am:
c1bc0a844d am:
dc9c094deb am:
9877c70d9d
am:
1064ee66d5
Change-Id: If501641b5a7cbb4264f40f3bcf2add35e0851f78
Jerry Zhang [Tue, 31 Jan 2017 01:09:09 +0000 (01:09 +0000)]
Merge changes I8eca5f24,I9d79c67c am:
54604d9143 am:
276672d192
am:
5445bdda28
Change-Id: I6f17910b547553571b3b92c60deb5ee8acf6af2a
Badhri Jagan Sridharan [Tue, 31 Jan 2017 01:08:00 +0000 (01:08 +0000)]
Check and send usb state broadcast when devices boots am:
af6d473ab0 am:
061bceafee
am:
df1df40f91
Change-Id: I28430b3de3ee91c4eb5dc4e4ef88e5924d56e2b4
Jerry Zhang [Tue, 31 Jan 2017 01:06:45 +0000 (01:06 +0000)]
Only send usb disconnect intents after boot. am:
c1bc0a844d am:
dc9c094deb
am:
9877c70d9d
Change-Id: I515745dd4f30a979fffcb6c9eea8a38e1bef11ca
Jerry Zhang [Tue, 31 Jan 2017 01:00:16 +0000 (01:00 +0000)]
Merge changes I8eca5f24,I9d79c67c am:
54604d9143
am:
276672d192
Change-Id: I74e78d829a718d145fcf1ae06ac9491329544f51
Badhri Jagan Sridharan [Tue, 31 Jan 2017 00:59:21 +0000 (00:59 +0000)]
Check and send usb state broadcast when devices boots am:
af6d473ab0
am:
061bceafee
Change-Id: Iabb4c7d6c120bb3b45703de084dc52ed958e1dba
Jerry Zhang [Tue, 31 Jan 2017 00:58:14 +0000 (00:58 +0000)]
Only send usb disconnect intents after boot. am:
c1bc0a844d
am:
dc9c094deb
Change-Id: Icfadbbe67ef80977500916bcb84f0c7989941b7c
Jerry Zhang [Tue, 31 Jan 2017 00:52:48 +0000 (00:52 +0000)]
Merge changes I8eca5f24,I9d79c67c
am:
54604d9143
Change-Id: I1e364d21949c9d4c16b14e60c630577399cdce05
Badhri Jagan Sridharan [Tue, 31 Jan 2017 00:52:43 +0000 (00:52 +0000)]
Check and send usb state broadcast when devices boots
am:
af6d473ab0
Change-Id: I13b0ea530c0701fd32d50d9c145f1b0e574fc9b0
TreeHugger Robot [Tue, 31 Jan 2017 00:51:53 +0000 (00:51 +0000)]
Merge "Don't count hw bitmap's textures in TextureCache"
Jerry Zhang [Tue, 31 Jan 2017 00:51:41 +0000 (00:51 +0000)]
Only send usb disconnect intents after boot.
am:
c1bc0a844d
Change-Id: Iaa8ff69de80b3efa558f82438cc6071f749a2dc8
TreeHugger Robot [Tue, 31 Jan 2017 00:41:57 +0000 (00:41 +0000)]
Merge "Camera2: Do not throw exception if addSurface size doesn't match"
Jerry Zhang [Tue, 31 Jan 2017 00:41:55 +0000 (00:41 +0000)]
Merge changes I8eca5f24,I9d79c67c
* changes:
Check and send usb state broadcast when devices boots
Only send usb disconnect intents after boot.
Badhri Jagan Sridharan [Tue, 24 Jan 2017 00:28:38 +0000 (16:28 -0800)]
Check and send usb state broadcast when devices boots
Broadcasts are not sent until BOOT_COMPLETED is received.
When the device boots with usb plugged, the UPDATE_STATE
for connted and configured would be received way before
BOOT_COMPLETED is received. Since, devices can continue
to stay in same usb configuration(set through persistent
property trigger), check and send a usb state broadcast
if needed.
BUG:
34451258
Test: Manually checked to verify the broadcasts sent.
Change-Id: I8eca5f241ad758f5c4f1afa6c9807868dfd6195a
Shukang Zhou [Tue, 31 Jan 2017 00:29:11 +0000 (00:29 +0000)]
[Frameworks] Add an 'am' cmd option to enable streaming in profiling.
am:
bb44e42de9 -s ours
Change-Id: I91c18d60043d5c56342576951d371c5de0116103
Dmitri Plotnikov [Tue, 31 Jan 2017 00:17:19 +0000 (00:17 +0000)]
Merge "Protecting TvExtender from being stripped by lightenPayload()"
sergeyv [Mon, 30 Jan 2017 22:24:48 +0000 (14:24 -0800)]
Don't count hw bitmap's textures in TextureCache
Test: refactoring CL.
bug:
34751775
Change-Id: I0f7c8338817329a5c75cec4e8b944779587d7b7f
TreeHugger Robot [Mon, 30 Jan 2017 23:08:31 +0000 (23:08 +0000)]
Merge "Switch how destroyHardwareResources works"
Robert Quattlebaum [Wed, 4 Jan 2017 21:28:01 +0000 (13:28 -0800)]
Minor updates to reflect libbinder changes.
* Parcel: Update comment to reflect new file path
* IpPrefix: Update AIDL file to indicate appropriate C++ header
Change-Id: Ia9edccca5e8ef1f36a709b593a768003e1234dfa
Shuzhen Wang [Sat, 28 Jan 2017 06:32:26 +0000 (22:32 -0800)]
Camera2: Do not throw exception if addSurface size doesn't match
During addSurface, the surface size may not match the preconfigured
size, because the surface could be asynchronously changing its size.
Only log a warning in this case, and depend on native implementation
of createCaptureSession or finalizeOutputConfigurations to detect the
size mismatch.
This also reverts commit
e56e606f82c94ab9adce1e6b69881653c225cf20,
and enforce the surfaceSize for deferred OutputConfiguration is not
0.
Test: Camera CTS
Bug:
34737377
Bug:
34697112
Change-Id: I4b66166a9a2739a09a16d635d2599a9bcf5c036b
Todd Kennedy [Wed, 25 Jan 2017 21:24:21 +0000 (13:24 -0800)]
Define targetSandboxVersion
The new attribute allows both ephemeral and non-ephemeral apps to
opt into a new, tighter security model.
Test: Manual; built app w/ targetSandboxVersion and verified the security domain
Change-Id: I8fcaf84e25f0519b438ba51302f79790e680e025
Jerry Zhang [Mon, 23 Jan 2017 22:14:09 +0000 (14:14 -0800)]
Only send usb disconnect intents after boot.
This prevents cases where the device starts up and attempts
to change the config, but intents cannot yet be sent.
A patch to resend this skipped intent is necessary to
finish fixing the bug.
Bug:
34451258
Test: Check that usb state is properly handled on boot
Change-Id: I9d79c67ce8982fd5b43fa40781b66bb9ae820694
Fyodor Kupolov [Mon, 30 Jan 2017 21:28:25 +0000 (13:28 -0800)]
Read SystemConfig on a worker thread
Also added lazy accessor for mBackgroundLaunchBroadcasts to give more
time for SystemConfig init to finish.
Test: manual
Bug:
34809967
Change-Id: Iaba0ac61714d94e72d571f33cd22d8700b89bb31
Chad Brower [Mon, 30 Jan 2017 22:25:24 +0000 (22:25 +0000)]
Merge "Update the accessibility gesture recognition logic, using prior assumptions about allowed gesture set to increase accuracy."
John Reck [Mon, 30 Jan 2017 18:15:48 +0000 (10:15 -0800)]
Switch how destroyHardwareResources works
destroyHardwareResources will now only force-destroy
the specific node it was called on, which are only
ever the root nodes. Rely on onRemovedFromTree()
to clean up resources for all other nodes.
Bug:
34736819
Test: RenderNode.multiTreeValidity passes, manually
verified fixes b/
34736819
Change-Id: I1c275ad6a98b63bf50f265602f09bffe3e1f169b
Etan Cohen [Mon, 30 Jan 2017 21:01:50 +0000 (13:01 -0800)]
[AWARE] Minor hardening of manager.
Callbacks are possible even if no listener was defined.
Perform a check and print error (as opposed to crashing).
Bug:
32315992
Test: unit-tests + integration tests passing
Change-Id: Ia5eb81448ace6b88abcd448e4f378da6530ac630
Shukang Zhou [Tue, 24 Jan 2017 23:30:29 +0000 (15:30 -0800)]
[Frameworks] Add an 'am' cmd option to enable streaming in profiling.
Add option '--streaming' to 'am start' and 'am profile' commands.
If the option is given, the output of method trace profiling
will be streamed into the specified file, so the output is no
longer limited by the buffer size.
Test: m -j48 test-art-host;
m -j48 ART_TEST_TRACE=true ART_TEST_TRACE_STREAM=true test-art-host;
I also tested manually. Tried all 8 combinations of
sampling/instrumention
streaming/non-streaming
'am start --start-profiler' / 'am profile start'
The output files are all in expected shape.
Bug:
33300765
Merged-In: I8a5136a1c7330c8260b7c6c8da63f42a73aee275
Change-Id: I8a5136a1c7330c8260b7c6c8da63f42a73aee275
TreeHugger Robot [Mon, 30 Jan 2017 20:43:11 +0000 (20:43 +0000)]
Merge "Allow ephemeral apps to access SOUND_EFFECTS_ENABLED"
Torbjorn Eklund [Mon, 30 Jan 2017 20:23:03 +0000 (20:23 +0000)]
Merge "SFR sims should treat Spain as roaming" am:
06aed6950d am:
e5f8e6088e am:
2cf376459b
am:
95451d5390
Change-Id: If9f4462435fd2adb81ad7b166f512550c6497e52
Torbjorn Eklund [Mon, 30 Jan 2017 20:18:23 +0000 (20:18 +0000)]
Merge "SFR sims should treat Spain as roaming" am:
06aed6950d am:
e5f8e6088e
am:
2cf376459b
Change-Id: I226139ecda3fea73e32699ccc98c4e2a334ded8d
Torbjorn Eklund [Mon, 30 Jan 2017 20:14:52 +0000 (20:14 +0000)]
Merge "SFR sims should treat Spain as roaming" am:
06aed6950d
am:
e5f8e6088e
Change-Id: Ifd7e98a0a1545f056128149e41fdfb35d479e54c
Torbjorn Eklund [Mon, 30 Jan 2017 20:10:23 +0000 (20:10 +0000)]
Merge "SFR sims should treat Spain as roaming"
am:
06aed6950d
Change-Id: I9500a419373ad590fddc31b638e37af05ac12830
Calin Juravle [Mon, 30 Jan 2017 20:07:17 +0000 (20:07 +0000)]
Merge changes Ic07126bf,If3a4b77f,I8b011207,I18fde62a
* changes:
Save package dex usage info after secondary dex reconciliation
Compile secondary dex files during background dexopt job
Add a shell command to force the background dexopt job
A bit more refactoring in BackgroundDexOptService
Treehugger Robot [Mon, 30 Jan 2017 20:03:11 +0000 (20:03 +0000)]
Merge "SFR sims should treat Spain as roaming"
Calin Juravle [Mon, 30 Jan 2017 20:00:12 +0000 (20:00 +0000)]
Merge "[PM] Clean up logic for secondary dex oat files"
Calin Juravle [Mon, 30 Jan 2017 19:59:03 +0000 (19:59 +0000)]
Merge "Compile secondary dex files in DexManager"
Julia Reynolds [Mon, 30 Jan 2017 19:37:01 +0000 (19:37 +0000)]
Merge "Add audio attributes to notificationchannel"
Julia Reynolds [Mon, 30 Jan 2017 13:54:53 +0000 (08:54 -0500)]
Use TVExtender channel on tv platforms.
Test: runtest sytemui-notification
Change-Id: I107bba298034778f1d7c0ba31896c4cbbc3fabe9
Dmitri Plotnikov [Mon, 30 Jan 2017 19:16:21 +0000 (11:16 -0800)]
Protecting TvExtender from being stripped by lightenPayload()
Test: Verified manually that TvExtenders actually
arrive in LeanbackLauncher
Change-Id: I42bfc340f7e92bc15243f66c6ae24a330d569262
Robert Greenwalt [Mon, 30 Jan 2017 19:20:39 +0000 (19:20 +0000)]
Merge "SFR sims should treat Spain as roaming" into nyc-mr2-dev am:
66d545bfe9
am:
98a5a760a0
Change-Id: Ia75b0e41239a31604319c2275ded0e0e95e2536c
Torbjorn Eklund [Mon, 30 Jan 2017 19:19:26 +0000 (19:19 +0000)]
SFR sims should treat Spain as roaming am:
05bd58fc4f
am:
c911358efd
Change-Id: I2d1aaf794d8c5e8b4adacf0228b12b70d8578044
Android Build Merger (Role) [Mon, 30 Jan 2017 19:13:02 +0000 (19:13 +0000)]
Merge "Merge "Bluetooth: add getDiscoveryEndMillis() call" am:
1785fc4eea am:
7f8d8638eb am:
ca312c1cd3 am:
9eb3d7e335"
Abodunrinwa Toki [Mon, 30 Jan 2017 19:12:46 +0000 (19:12 +0000)]
Merge "Implement TextClassification system service."
Marie Janssen [Mon, 30 Jan 2017 19:11:46 +0000 (19:11 +0000)]
Merge "Bluetooth: add getDiscoveryEndMillis() call" am:
1785fc4eea am:
7f8d8638eb am:
ca312c1cd3
am:
9eb3d7e335
Change-Id: I45a29862c9a841b68bee41daff1d8e46145cbd79
TreeHugger Robot [Mon, 30 Jan 2017 19:07:55 +0000 (19:07 +0000)]
Merge "Binary compatibility stubs for get/setTooltip()"
TreeHugger Robot [Mon, 30 Jan 2017 18:31:17 +0000 (18:31 +0000)]
Merge "Don't scroll popup parent in response to parent scrolling"
Chad Brubaker [Mon, 30 Jan 2017 18:28:43 +0000 (10:28 -0800)]
Allow ephemeral apps to access SOUND_EFFECTS_ENABLED
Test: Manual
Change-Id: I9e574f35b5f007cf62665a60f075fc8ee5096158
Robert Greenwalt [Mon, 30 Jan 2017 18:19:55 +0000 (18:19 +0000)]
Merge "SFR sims should treat Spain as roaming" into nyc-mr2-dev
am:
66d545bfe9
Change-Id: I8019fc3e0b38f46191d3f8205a01727afaa9da3a