OSDN Git Service
Paul Duffin [Fri, 5 Jan 2018 15:11:18 +0000 (15:11 +0000)]
Add android.test.legacy target
Adds a library that builds against the public API and so can be safely
statically included into applications to avoid them having to depend
on the android.test.base and android.test.runner runtime libraries.
Bug:
30188076
Test: make checkbuild
Change-Id: Iae7e3c64392e11035322092ed8e194740ba2d321
Paul Duffin [Fri, 5 Jan 2018 13:52:17 +0000 (13:52 +0000)]
Modify android.test.runner to use new mock APIs
Previous change added some new public APIs to allow the
android.test.runner classes to be built against the public API stubs
rather than the internal classes. This change updates the
android.test.runner classes to use that new API.
This in turn is preparation for building an android.test.legacy library
that can be safely statically included in APKs.
Bug:
30188076
Test: make checkbuild
Change-Id: I302626abb7e048ef0c3169e9a5209b85f2f87d34
Paul Duffin [Fri, 22 Dec 2017 16:13:15 +0000 (16:13 +0000)]
Add apis needed for android.test.legacy
The long term goal of removing junit and dependent android.test classes
from the android.jar is the removal of the runtime libraries that
provide those classes. A key part of the strategy for migrating APKs off
the runtime libraries is the android.test.legacy library which APKs can
statically include in place of the runtime dependencies without having
to change their source code.
The longer term goal is for all tests to migrate from these classes
altogther and to use the Android Test Support Library instead but that
will require significant changes to the test source code.
In order for it to be safe to statically include android.test.legacy in
an APK it cannot use any internal APIs. This change adds the additional
classes and methods needed to the android.test.mock API library. The
additions are all marked as deprecated to try and avoid developers
from using them in new tests.
It also marks the AccountManager constructor used by MockAccountManager
with the android.annotation.MockApi so that it is included in the mock
stubs libraries against which the android.test.mock.stubs[-system]
libraries build.
Bug:
30188076
Test: make checkbuild
Change-Id: I85417cc328cab898ab93b9b726648f4232555324
TreeHugger Robot [Tue, 9 Jan 2018 11:14:25 +0000 (11:14 +0000)]
Merge "Mark translatable="false" for DevicePolicyManager.getDisallowedSystemApps xmls"
TreeHugger Robot [Tue, 9 Jan 2018 10:03:01 +0000 (10:03 +0000)]
Merge changes Ibe8c8d3c,I4a475d6f
* changes:
Thread-safety at log processor level.
Handle null string in jni and c++ stats-log-api interfaces.
TreeHugger Robot [Tue, 9 Jan 2018 09:33:14 +0000 (09:33 +0000)]
Merge "Make SystemApi retained at runtime"
TreeHugger Robot [Tue, 9 Jan 2018 08:46:22 +0000 (08:46 +0000)]
Merge "WorkSource: Fix WorkSource#remove for chained worksources."
TreeHugger Robot [Tue, 9 Jan 2018 06:46:22 +0000 (06:46 +0000)]
Merge "Update clock whenever AoD unpauses"
Jeff Sharkey [Tue, 9 Jan 2018 05:40:53 +0000 (05:40 +0000)]
Merge "Wire up reserved blocks presence for tests."
Lucas Dupin [Mon, 8 Jan 2018 18:21:52 +0000 (10:21 -0800)]
Update clock whenever AoD unpauses
Clock might show wrong time otherwise.
Test: cover prox sensor, look at clock
Change-Id: I73e37f133e877ef0affa038f23b0e11787f9aa65
Fixes:
65674396
Siyamed Sinir [Tue, 9 Jan 2018 04:34:48 +0000 (04:34 +0000)]
Merge "Prevent crash for Span change events"
TreeHugger Robot [Tue, 9 Jan 2018 03:28:11 +0000 (03:28 +0000)]
Merge "Revert "Enable incidentd, it will just be idle while no one triggers it.""
TreeHugger Robot [Tue, 9 Jan 2018 03:19:03 +0000 (03:19 +0000)]
Merge "Duration format for tunable settings"
TreeHugger Robot [Tue, 9 Jan 2018 02:29:53 +0000 (02:29 +0000)]
Merge "Migrate PrintSpooler to aapt2."
Sudheer Shanka [Tue, 9 Jan 2018 02:28:51 +0000 (02:28 +0000)]
Merge "Add a global setting to turn on/off the proc state cpu times tracking."
TreeHugger Robot [Tue, 9 Jan 2018 02:20:32 +0000 (02:20 +0000)]
Merge "incidentd: Updating process state enum."
TreeHugger Robot [Tue, 9 Jan 2018 02:03:01 +0000 (02:03 +0000)]
Merge "Remove SystemApi annotation from EuiccManager.getOtaStatus()"
TreeHugger Robot [Tue, 9 Jan 2018 01:56:58 +0000 (01:56 +0000)]
Merge "Fixes recents visibility when overview service connection changes"
Yi Jin [Tue, 9 Jan 2018 01:44:47 +0000 (01:44 +0000)]
Revert "Enable incidentd, it will just be idle while no one triggers it."
This reverts commit
d612df381e7867780266f0a1161b817e089c3bb6.
Reason for revert: Selinux denials, see b/
71591707 for more details.
Change-Id: I864cd74e7ba57d67e2ed8328a7df9c5ff335508c
TreeHugger Robot [Tue, 9 Jan 2018 01:29:00 +0000 (01:29 +0000)]
Merge "Work on issue #
70859548: Reduce amount of time spent collecting pss data"
Chavi Weingarten [Tue, 9 Jan 2018 01:27:31 +0000 (01:27 +0000)]
Merge "Adjust animation final crop bounds so it's in screen space."
Christine Franks [Tue, 9 Jan 2018 00:56:08 +0000 (00:56 +0000)]
Merge "Remove DEMO_USER_SETUP_COMPLETE"
Sudheer Shanka [Sat, 6 Jan 2018 01:25:46 +0000 (17:25 -0800)]
Add a global setting to turn on/off the proc state cpu times tracking.
Bug:
66953194
Test: atest core/tests/coretests/src/com/android/internal/os/BatteryStatsTests.java
Test: atest hostsidetests/incident/src/com/android/server/cts/BatteryStatsValidationTest.java
Test: atest core/tests/coretests/src/com/android/internal/os/BstatsCpuTimesValidationTest.java
Change-Id: Id26476ad77c95994f358d8bd59b6c2e6513c4c54
Cassie Han [Tue, 9 Jan 2018 00:17:11 +0000 (00:17 +0000)]
Merge "Migrate flag config_telephony_use_own_number_for_voicemail to Carrier Config." am:
9c1279d2ae am:
28dd9dfeb5
am:
658e7119a6
Change-Id: If54d03e016ef258b391540b46389f4e3d26e4cb6
Toby Sargeant [Tue, 9 Jan 2018 00:12:33 +0000 (00:12 +0000)]
Merge "Add a Java FindAddress implentation." am:
9ea410a6f8 am:
da4e3b68fb
am:
ef5218836d
Change-Id: Ic896c9f805330c28e9e0c3ca583f28e80bc47184
TreeHugger Robot [Tue, 9 Jan 2018 00:01:03 +0000 (00:01 +0000)]
Merge "Block location quick settings when disallow_config_location_mode is set."
Sudheer Shanka [Mon, 8 Jan 2018 23:51:40 +0000 (23:51 +0000)]
Merge "Attribute procstate cpu times to correct battery/screen on/off buckets."
TreeHugger Robot [Mon, 8 Jan 2018 23:42:26 +0000 (23:42 +0000)]
Merge "Some fixes in duration metrics"
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."
Yangster-mac [Fri, 5 Jan 2018 23:44:07 +0000 (15:44 -0800)]
Thread-safety at log processor level.
Test: statsd unit test passed.
Change-Id: Ibe8c8d3cc8297875b16ee385c077b71c87353147
Yangster-mac [Mon, 8 Jan 2018 22:54:48 +0000 (14:54 -0800)]
Handle null string in jni and c++ stats-log-api interfaces.
Test: statsd unit test passed.
Change-Id: I4a475d6fcc0b4a0293450bc0ccdd718b362c498b
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"
Matthew Ng [Mon, 8 Jan 2018 22:26:40 +0000 (14:26 -0800)]
Fixes recents visibility when overview service connection changes
When the service is connected, it will immediately show the recents
button and when disconnected the button will be invisible.
Test: manual, toggle in launcher settings
Bug:
67957962
Change-Id: Ie36c4f0a50b6c3ae11e5367ae70a57ee16056e09
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
yuemingw [Mon, 8 Jan 2018 22:12:05 +0000 (22:12 +0000)]
Block location quick settings when disallow_config_location_mode is set.
Bug:
67674888
Test: manual
Change-Id: I157e513ff556c99b1cf86a99c6f46023a044cef1
Pankaj Kanwar [Mon, 8 Jan 2018 22:02:18 +0000 (22:02 +0000)]
Merge "Change warning message for roaming for DTAG."
Siyamed Sinir [Mon, 8 Jan 2018 21:57:59 +0000 (13:57 -0800)]
Prevent crash for Span change events
For some spans, SpannableStringBuilder cannot determine the previous
start and previous end values correctly. In some cases, previous end
value is smaller than previous start value, and this causes
DynamicLayout to access negative index values. This CL updates
DynamicLayout to reflow from index 0 if such a case occurs.
Test: Added a CTS test
Test: bit CtsTextTestCases:android.text.cts.DynamicLayoutTest#testReflow_afterSpanChangedShouldNotThrowException
Bug:
67926915
Change-Id: Ibc55edfd5e49a7782cdd807e2465f4f21577b68d
Christine Franks [Mon, 8 Jan 2018 21:40:19 +0000 (13:40 -0800)]
Remove DEMO_USER_SETUP_COMPLETE
This @hide setting is no longer used.
Bug:
71594447
Test: make -j100
Change-Id: Ib412f4c16eabb5bedb9e4538db294bfdfb2a4478
chaviw [Mon, 8 Jan 2018 21:36:23 +0000 (13:36 -0800)]
Adjust animation final crop bounds so it's in screen space.
The final crop bounds for animations should use the screen space bounds
instead of stack bounds. Adjust the bounds so they're offset by the
stack position.
Test: WindowAnimationSpec#testApply_clipAfterOffsetPosition
Change-Id: Ibfda5ab505ee3206175e5f59e82f1c16f78d19c4
Fixes:
71619195
Cassie Han [Mon, 8 Jan 2018 21:28:02 +0000 (21:28 +0000)]
Merge "Migrate flag config_telephony_use_own_number_for_voicemail to Carrier Config." am:
9c1279d2ae
am:
28dd9dfeb5
Change-Id: I9b8a48709850b545b806fb605d1d94e9cdefe1d0
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
Toby Sargeant [Mon, 8 Jan 2018 21:23:45 +0000 (21:23 +0000)]
Merge "Add a Java FindAddress implentation." am:
9ea410a6f8
am:
da4e3b68fb
Change-Id: I7b2448fcb2edb4bc9000fd5e55f7295e6c6ff676
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"
Yao Chen [Mon, 8 Jan 2018 19:17:11 +0000 (11:17 -0800)]
Some fixes in duration metrics
+ Don't need to keep the condition key if the condition is not sliced.
+ Whiten the hash before returning.
Test: statsd_test
Change-Id: Ie0bcb14b3adc4a15b79ba3be050431a672a68c28
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"
Alex Chau [Mon, 8 Jan 2018 18:34:38 +0000 (18:34 +0000)]
Mark translatable="false" for DevicePolicyManager.getDisallowedSystemApps xmls
Bug:
71570743
Test: Disallowed apps are still moved
Change-Id: I7b7019fdeca4d75da42a77f3d66e310a08ec38d1
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."
Jeff Sharkey [Mon, 8 Jan 2018 17:41:47 +0000 (10:41 -0700)]
Wire up reserved blocks presence for tests.
This is how we tell CTS if the device has reserved blocks set aside
for system critical services.
Test: builds, boots
Bug:
62024591
Change-Id: Ib970554235b49346f9e9df7d3d1646beb168cd92
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
Cassie Han [Mon, 8 Jan 2018 17:32:39 +0000 (17:32 +0000)]
Merge "Migrate flag config_telephony_use_own_number_for_voicemail to Carrier Config."
am:
9c1279d2ae
Change-Id: I2c5c351cbe01bd5bd66d15a382ff6df5bede8c6a
Cassie Han [Mon, 8 Jan 2018 17:25:26 +0000 (17:25 +0000)]
Merge "Migrate flag config_telephony_use_own_number_for_voicemail to Carrier Config."
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"