OSDN Git Service

android-x86/frameworks-base.git
7 years agoDo not stop lock task if it is starting background user
Tony Mak [Mon, 3 Apr 2017 17:38:23 +0000 (18:38 +0100)]
Do not stop lock task if it is starting background user

We do not switch user when starting background user, so no need to
stop lock task.

Refactor a bit to make unit test possible.

Test: runtest -x frameworks/base/services/tests/servicestests/src/com/android/server/am/UserControllerTest.java
Test: Lock an app using TestDPC, creating work profile, lock task is not dismissed

Bug: 35591838

Change-Id: I52c1f6ba07860df9266462750bf953a002f69026

7 years agoMerge "Schedule window animations at vsync-sf" into oc-dev
Jorim Jaggi [Tue, 4 Apr 2017 09:26:00 +0000 (09:26 +0000)]
Merge "Schedule window animations at vsync-sf" into oc-dev

7 years agoMerge "Handle case when snapshot dimensions don't match" into oc-dev
Jorim Jaggi [Tue, 4 Apr 2017 09:14:35 +0000 (09:14 +0000)]
Merge "Handle case when snapshot dimensions don't match" into oc-dev

7 years agoMerge "ANativeWindow_toSurface implementation" into oc-dev
TreeHugger Robot [Tue, 4 Apr 2017 04:30:11 +0000 (04:30 +0000)]
Merge "ANativeWindow_toSurface implementation" into oc-dev

7 years agoMerge "Fix AccessibilityManager returning duplicate services" into oc-dev
Casey Burkhardt [Tue, 4 Apr 2017 04:29:21 +0000 (04:29 +0000)]
Merge "Fix AccessibilityManager returning duplicate services" into oc-dev

7 years agoMerge "Bluetooth: Ensure only desired intents are being handled" into oc-dev
TreeHugger Robot [Tue, 4 Apr 2017 03:49:14 +0000 (03:49 +0000)]
Merge "Bluetooth: Ensure only desired intents are being handled" into oc-dev

7 years agoMerge "Revert "Refresh opacity and statefulness on tint change"" into oc-dev
Ian Pedowitz [Tue, 4 Apr 2017 03:38:55 +0000 (03:38 +0000)]
Merge "Revert "Refresh opacity and statefulness on tint change"" into oc-dev

7 years agoRevert "Refresh opacity and statefulness on tint change"
Yohei Yukawa [Tue, 4 Apr 2017 03:30:01 +0000 (03:30 +0000)]
Revert "Refresh opacity and statefulness on tint change"

This reverts commit 1eda069f7c9a36e58c17ecf185a5c0906be5df95.

Reason to revert:
The setup wizard started throwing android.view.InflateException due to
I89f6d804fb025f426aefdee67559778cf03015bb. Temporarily reverting that
change until we figure out what is going on.

Change-Id: I9344a3402f2fab02f4fe49a6a8ad91970b2d3b3e
Test: Manually verified that the setup wizard no longer crashes.
Bug: 33124798
Bug: 36870685

7 years agoMerge "Themes: Apply themes to system_server safely" into oc-dev
TreeHugger Robot [Tue, 4 Apr 2017 03:25:25 +0000 (03:25 +0000)]
Merge "Themes: Apply themes to system_server safely" into oc-dev

7 years agoMerge "Make sure that the device name is not null before returning it" into oc-dev
TreeHugger Robot [Tue, 4 Apr 2017 03:24:14 +0000 (03:24 +0000)]
Merge "Make sure that the device name is not null before returning it" into oc-dev

7 years agoMerge "Clean up activity/stack associations." into oc-dev
Bryce Lee [Tue, 4 Apr 2017 03:01:46 +0000 (03:01 +0000)]
Merge "Clean up activity/stack associations." into oc-dev

7 years agoMerge "In MountEmulatedStorage() do not try to mount for mode MOUNT_EXTERNAL_NONE...
TreeHugger Robot [Tue, 4 Apr 2017 02:59:30 +0000 (02:59 +0000)]
Merge "In MountEmulatedStorage() do not try to mount for mode MOUNT_EXTERNAL_NONE." into oc-dev

7 years agoMerge "Audio focus: API for external audio focus policy" into oc-dev
TreeHugger Robot [Tue, 4 Apr 2017 02:39:58 +0000 (02:39 +0000)]
Merge "Audio focus: API for external audio focus policy" into oc-dev

7 years agoANativeWindow_toSurface implementation
Jiwen 'Steve' Cai [Fri, 31 Mar 2017 18:19:50 +0000 (11:19 -0700)]
ANativeWindow_toSurface implementation

This enables the conversion from an ANativeWindow (created by NDK API
such as: AImageReader_create) to a Java Surface, so that developers can
hookup a Java Producer to a native buffer consumer.

This CL also introduces android_view_Surface_createFromSurface helper
function in libandroid_runtime to convert a C++ sp<Surface> to a Java
Surface object.

Bug: 36862948
Test: android.media.cts.NativeImageReaderTest
Change-Id: Ia99adb654da505ac117a8e58153ac800df23a650

7 years agoMerge "Rename UsbRequest.enqueue to UsbRequest.queue" into oc-dev
TreeHugger Robot [Tue, 4 Apr 2017 01:57:15 +0000 (01:57 +0000)]
Merge "Rename UsbRequest.enqueue to UsbRequest.queue" into oc-dev

7 years agoBluetooth: Ensure only desired intents are being handled
Jack He [Mon, 3 Apr 2017 22:13:57 +0000 (15:13 -0700)]
Bluetooth: Ensure only desired intents are being handled

* Prevent arbitrary intents from making Bluetooth undiscoverable by only
  allowing DISCOVERABLE_TIMEOUT intent to be handled

Bug: 33058582
Test: make, test for Broadcast and Bluetooth scanning
Change-Id: Ib8b04dddf1610a082d167825253f3e1c968aaa14

7 years agoMerge "Update display contents when metrics change" into oc-dev
Andrii Kulian [Tue, 4 Apr 2017 01:38:22 +0000 (01:38 +0000)]
Merge "Update display contents when metrics change" into oc-dev

7 years agoMerge "Emit fingerprints during OTA upgrades." into oc-dev
TreeHugger Robot [Tue, 4 Apr 2017 01:33:24 +0000 (01:33 +0000)]
Merge "Emit fingerprints during OTA upgrades." into oc-dev

7 years agoMerge "Increase visibility of FEATURE_LEANBACK_ONLY" into oc-dev
TreeHugger Robot [Tue, 4 Apr 2017 01:28:37 +0000 (01:28 +0000)]
Merge "Increase visibility of FEATURE_LEANBACK_ONLY" into oc-dev

7 years agoMake sure that the device name is not null before returning it
Ajay Panicker [Mon, 3 Apr 2017 19:15:54 +0000 (12:15 -0700)]
Make sure that the device name is not null before returning it

Bug: 30948380
Test: Pair a device
Change-Id: I1b5610c85d6e74cec89fab0db3db281938a05a8c

7 years agoMerge "TIF: use integer for constants instead of string" into oc-dev
TreeHugger Robot [Tue, 4 Apr 2017 01:10:39 +0000 (01:10 +0000)]
Merge "TIF: use integer for constants instead of string" into oc-dev

7 years agoMerge "Move back networking policy logic into NetworkPolicyManagerService" into oc-dev
Hugo Benichi [Tue, 4 Apr 2017 00:50:20 +0000 (00:50 +0000)]
Merge "Move back networking policy logic into NetworkPolicyManagerService" into oc-dev

7 years agoIn MountEmulatedStorage() do not try to mount for mode MOUNT_EXTERNAL_NONE.
Robert Sesek [Mon, 20 Mar 2017 21:30:05 +0000 (17:30 -0400)]
In MountEmulatedStorage() do not try to mount for mode MOUNT_EXTERNAL_NONE.

When creating an isolatedProcess=true service and when the native bridge
is in use, MountEmulatedStorage() is called with force_mount_namespace=true
and MOUNT_EXTERNAL_NONE. This led to an abort crash, since the process
would attempt to mount an empty path string.

Test: android.externalservice.cts.ExternalServiceTest built for ARM, run on Fugu
Bug: 36072260
Change-Id: I9441bcbd30167971ad486726bbeae57f3c4aebe9
Merged-In: I88474b6f50ae7cfab40ba44ff1da0df6021a2fb0
(cherry picked from commit 06f393067772f613e938f794444dc90e90c40fc0)

7 years agoMerge "Fixed NPE when FillService replies with a null FillResponse." into oc-dev
TreeHugger Robot [Tue, 4 Apr 2017 00:39:52 +0000 (00:39 +0000)]
Merge "Fixed NPE when FillService replies with a null FillResponse." into oc-dev

7 years agoMerge "Fixing issue with activity incorrectly auto-entering PiP." into oc-dev
TreeHugger Robot [Tue, 4 Apr 2017 00:39:05 +0000 (00:39 +0000)]
Merge "Fixing issue with activity incorrectly auto-entering PiP." into oc-dev

7 years agoMerge "Add some strings that will be needed for QS changes" into oc-dev
TreeHugger Robot [Tue, 4 Apr 2017 00:35:37 +0000 (00:35 +0000)]
Merge "Add some strings that will be needed for QS changes" into oc-dev

7 years agoMerge "media: unhide mediarecorder's setVideoEncodingProfileLevel api." into oc-dev
TreeHugger Robot [Tue, 4 Apr 2017 00:33:42 +0000 (00:33 +0000)]
Merge "media: unhide mediarecorder's setVideoEncodingProfileLevel api." into oc-dev

7 years agoMerge "Expose animator settings to Instant Apps" into oc-dev
TreeHugger Robot [Tue, 4 Apr 2017 00:23:30 +0000 (00:23 +0000)]
Merge "Expose animator settings to Instant Apps" into oc-dev

7 years agoMerge "Adds appropriate filtering for instant apps" into oc-dev
TreeHugger Robot [Mon, 3 Apr 2017 23:55:14 +0000 (23:55 +0000)]
Merge "Adds appropriate filtering for instant apps" into oc-dev

7 years agoMerge "support shutdown animation from bootanim" into oc-dev
TreeHugger Robot [Mon, 3 Apr 2017 23:51:34 +0000 (23:51 +0000)]
Merge "support shutdown animation from bootanim" into oc-dev

7 years agoMerge "Expose framework activities to Instant Apps" into oc-dev
TreeHugger Robot [Mon, 3 Apr 2017 23:51:02 +0000 (23:51 +0000)]
Merge "Expose framework activities to Instant Apps" into oc-dev

7 years agoMerge "Not send switch intents if there is no real intent" into oc-dev
TreeHugger Robot [Mon, 3 Apr 2017 23:44:41 +0000 (23:44 +0000)]
Merge "Not send switch intents if there is no real intent" into oc-dev

7 years agoClean up activity/stack associations.
Bryce Lee [Mon, 20 Mar 2017 21:20:22 +0000 (14:20 -0700)]
Clean up activity/stack associations.

The stack currently holds a reference to resuming and pausing
activities. These are usually cleaned up when the activity ends or
the task is reparented. However, it is possible for an activity to
lose its reference to its task in other areas (such as
ActivityStarter), which can lead to the stack not being updated
correctly.

This changelist adds a method to the ActivityStack to disassociate
the stack from an ActivityRecord. In addition to places where this is
called when an activity ends, this method is invoked on the children
of a task when the task is reparented. The task member variable of
ActivityRecord is also now surrounded by a setter/getter, with the
setter always invoking the dissociation logic on a previous stack.

Test: bit FrameworksServicesTests:com.android.server.am.ActivityRecordTests
Change-Id: Iffeccdb6f011958896271673946acfed28856f53
Fixes: 36387417

7 years agoMerge "Don't wtf() for reverse profile access; make it a warning." into oc-dev
TreeHugger Robot [Mon, 3 Apr 2017 23:31:56 +0000 (23:31 +0000)]
Merge "Don't wtf() for reverse profile access; make it a warning." into oc-dev

7 years agoMerge "Whitelist DMAgent from bg check" into oc-dev
TreeHugger Robot [Mon, 3 Apr 2017 23:30:36 +0000 (23:30 +0000)]
Merge "Whitelist DMAgent from bg check" into oc-dev

7 years agoEmit fingerprints during OTA upgrades.
Jeff Sharkey [Mon, 3 Apr 2017 23:22:35 +0000 (17:22 -0600)]
Emit fingerprints during OTA upgrades.

Can be used to help confirm diagnosis of bugs like 34525014.

Test: builds, boots
Bug: 36795529
Change-Id: Ie2517061ef031716c493b2544b0fb95628f20737

7 years agoMerge "Handle edge-case where the focus-search root is focused" into oc-dev
Evan Rosky [Mon, 3 Apr 2017 23:10:48 +0000 (23:10 +0000)]
Merge "Handle edge-case where the focus-search root is focused" into oc-dev

7 years agoIncrease visibility of FEATURE_LEANBACK_ONLY
Daniel Cardenas [Mon, 3 Apr 2017 21:42:42 +0000 (14:42 -0700)]
Increase visibility of FEATURE_LEANBACK_ONLY

Bug: 36003137
Test: Build on Fugu and CTS
Change-Id: Iab9be686a004c5c0d1fae02a33898f7ebb264b27

7 years agoMerge "Refresh opacity and statefulness on tint change" into oc-dev
TreeHugger Robot [Mon, 3 Apr 2017 22:47:28 +0000 (22:47 +0000)]
Merge "Refresh opacity and statefulness on tint change" into oc-dev

7 years agoMerge "Address API concerns for isConcurrentVoiceAndDataAllowed and OnReceiveUssdResp...
Pankaj Kanwar [Mon, 3 Apr 2017 22:35:59 +0000 (22:35 +0000)]
Merge "Address API concerns for isConcurrentVoiceAndDataAllowed and OnReceiveUssdResponseCallback." into oc-dev

7 years agoAdd some strings that will be needed for QS changes
Jason Monk [Mon, 3 Apr 2017 22:27:01 +0000 (18:27 -0400)]
Add some strings that will be needed for QS changes

Test: make
Bug: 34765805
Change-Id: I8824314ffe7c91502dc6b516506a98507cdf03ab

7 years agoMerge "Framework support to improve bg check CTS tests." into oc-dev
TreeHugger Robot [Mon, 3 Apr 2017 22:25:53 +0000 (22:25 +0000)]
Merge "Framework support to improve bg check CTS tests." into oc-dev

7 years agoMerge "Revert "Deprecate EXTRA_STREAM."" into oc-dev
TreeHugger Robot [Mon, 3 Apr 2017 22:17:13 +0000 (22:17 +0000)]
Merge "Revert "Deprecate EXTRA_STREAM."" into oc-dev

7 years agoMerge "Warn if IMM#showSoftInputUnchecked() is called" into oc-dev
Yohei Yukawa [Mon, 3 Apr 2017 22:14:25 +0000 (22:14 +0000)]
Merge "Warn if IMM#showSoftInputUnchecked() is called" into oc-dev

7 years agoMerge "Remove/fix broken test due to change to DUMP permission check." into oc-dev
TreeHugger Robot [Mon, 3 Apr 2017 22:13:26 +0000 (22:13 +0000)]
Merge "Remove/fix broken test due to change to DUMP permission check." into oc-dev

7 years agoMerge "Make some intents public in SubscriptionManager." into oc-dev
Sanket Padawe [Mon, 3 Apr 2017 22:10:24 +0000 (22:10 +0000)]
Merge "Make some intents public in SubscriptionManager." into oc-dev

7 years agoFixing issue with activity incorrectly auto-entering PiP.
Winson Chung [Mon, 3 Apr 2017 22:04:20 +0000 (15:04 -0700)]
Fixing issue with activity incorrectly auto-entering PiP.

- When the PiP menu activity was brought forward, we were inadvertently
  setting the auto-enter supported flag for the PiP base activity as
  well, which would trigger auto-enter PiP once the activity is moved
  back to fullscreen and then subsequently finished.

Bug: 36352343
Bug: 36364010
Test: android.server.cts.ActivityManagerPinnedStackTests
Change-Id: Id1b800bf392d03b55562fb13374e33a5ff0ebda6

7 years agoFixed NPE when FillService replies with a null FillResponse.
Felipe Leme [Mon, 3 Apr 2017 20:53:21 +0000 (13:53 -0700)]
Fixed NPE when FillService replies with a null FillResponse.

This problem was not detected by CTS tests because the exception is
"harmless" (it's just ignored), but it can be verified at logcat:

W Binder  : Caught a RuntimeException from the binder stub implementation.
W Binder  : java.lang.NullPointerException: Attempt to invoke virtual method 'android.content.IntentSender android.service.autofill.FillResponse.getAuthentication()' on a null object reference
W Binder  :  at com.android.server.autofill.ViewState.maybeCallOnFillReady(ViewState.java:159)

Bug: 35707731
Test: CtsAutoFillServiceTestCases pass
Test: manual verification
Change-Id: I58330a7e91b2c186bf97897b7d39640010ca630b

7 years agoExpose framework activities to Instant Apps
Chad Brubaker [Mon, 3 Apr 2017 21:45:23 +0000 (14:45 -0700)]
Expose framework activities to Instant Apps

Bug: 36864579
Test: Instant apps can use choosers and account picker
Change-Id: Ie8d3a019ffc91497a314b2c9d5a09f6ca5b0ba9f

7 years agoMerge "TIF: Rename COLUMN_APP_LINK_INTENT_URI to COLUMN_INTENT_URI" into oc-dev
TreeHugger Robot [Mon, 3 Apr 2017 21:46:32 +0000 (21:46 +0000)]
Merge "TIF: Rename COLUMN_APP_LINK_INTENT_URI to COLUMN_INTENT_URI" into oc-dev

7 years agoAudio focus: API for external audio focus policy
Jean-Michel Trivi [Mon, 3 Apr 2017 06:19:02 +0000 (23:19 -0700)]
Audio focus: API for external audio focus policy

System API for an external audio focus policy. Extends
 the system focus listener with interception of
 focus requests and abandons. Adds method for the focus
 policy to dispatch focus grants and losses.

Test: gts-tradefed run gts -m GtsGmscoreHostTestCases -t 'com.google.android.gts.audio.AudioHostTest#testFocusPolicy'
Bug: 30258418
Change-Id: If408569a2dce07a774e0e2f1be9f1af8e426d2d3

7 years agosupport shutdown animation from bootanim
Keun-young Park [Thu, 23 Mar 2017 20:46:24 +0000 (13:46 -0700)]
support shutdown animation from bootanim

- init will set sys.powerctl property and run bootanim.
- Use /oem/media/shutdownanimation.zip or
  /system/media/shutdownanimation.zip for animation file.
  If none of them exist, android animation will be used.
- Disable audio playing for shutdown animation.
- Disable TimeCheckThread for shutdown animation. It
  accesses /data partition and can block umount.

bug: 36526187
Test: many reboots

Change-Id: If02c73cda2015317d88d056cd45201208da49946

7 years agoMerge "Remove workaround for end() not supported in some app" into oc-dev
TreeHugger Robot [Mon, 3 Apr 2017 21:41:12 +0000 (21:41 +0000)]
Merge "Remove workaround for end() not supported in some app" into oc-dev

7 years agoExpose animator settings to Instant Apps
Chad Brubaker [Mon, 3 Apr 2017 21:34:50 +0000 (14:34 -0700)]
Expose animator settings to Instant Apps

Bug: 36861394
Test: Instant Apps can access the settings
Change-Id: I0e414cb068a47e9a6f62239ffcb922de54586a71

7 years agoMerge "Make Color non-final because apps break..." into oc-dev
TreeHugger Robot [Mon, 3 Apr 2017 21:21:13 +0000 (21:21 +0000)]
Merge "Make Color non-final because apps break..." into oc-dev

7 years agoDon't wtf() for reverse profile access; make it a warning.
Makoto Onuki [Mon, 3 Apr 2017 19:48:42 +0000 (12:48 -0700)]
Don't wtf() for reverse profile access; make it a warning.

Bug:36003688
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest1 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest2 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest3 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest4 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest5 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest6 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest7 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest8 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest9 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest10 -w com.android.frameworks.servicestests
Change-Id: I6d6a73e1d9281dc0b92186dd0666865b0f6b3f1c

7 years agoMerge "Javadoc fix for View.setTooltipText" into oc-dev
TreeHugger Robot [Mon, 3 Apr 2017 20:55:11 +0000 (20:55 +0000)]
Merge "Javadoc fix for View.setTooltipText" into oc-dev

7 years agoMerge "Persistent connection to DO/PO service." into oc-dev
TreeHugger Robot [Mon, 3 Apr 2017 20:35:14 +0000 (20:35 +0000)]
Merge "Persistent connection to DO/PO service." into oc-dev

7 years agoRevert "Deprecate EXTRA_STREAM."
Jeff Sharkey [Mon, 3 Apr 2017 20:14:10 +0000 (20:14 +0000)]
Revert "Deprecate EXTRA_STREAM."

This reverts commit a0ba51c2ab75c8e0406bbd43742597552b6dae98.

Bug: 35293781
Change-Id: I5f0b9000535ac0bcbbe125fe781c20c5fb0c8782

7 years agoRemove/fix broken test due to change to DUMP permission check.
Makoto Onuki [Mon, 3 Apr 2017 18:24:25 +0000 (11:24 -0700)]
Remove/fix broken test due to change to DUMP permission check.

Bug 36854321
Test: adb shell am instrument -e class 'com.android.server.pm.ShortcutManagerTest2' -w com.android.frameworks.servicestests

Change-Id: I80f2a326b70f8d0598246732510e3725a0c58871

7 years agomedia: unhide mediarecorder's setVideoEncodingProfileLevel api.
Hangyu Kuang [Sat, 10 Sep 2016 00:34:52 +0000 (17:34 -0700)]
media: unhide mediarecorder's setVideoEncodingProfileLevel api.

Test: GoogleCmaera app.
bug: 35151543
Change-Id: I37dee948298a14d338bca670af0bc01450c83529

7 years agoTIF: use integer for constants instead of string
Dongwon Kang [Fri, 31 Mar 2017 19:40:20 +0000 (12:40 -0700)]
TIF: use integer for constants instead of string

Test: cts-tradefed run cts -m CtsTvTestCases
Bug: 36395855
Change-Id: I9f0d62acb73883f543219a1ee4ed961140221a11

7 years agoTIF: Rename COLUMN_APP_LINK_INTENT_URI to COLUMN_INTENT_URI
Dongwon Kang [Fri, 24 Mar 2017 00:05:38 +0000 (17:05 -0700)]
TIF: Rename COLUMN_APP_LINK_INTENT_URI to COLUMN_INTENT_URI

Test: cts-tradefed run cts -m CtsTvTestCases
Bug: 35856179
Change-Id: I284cb1b764203c646e3edb3f105d90d59a7688d1

7 years agoMerge "Revert "Push chooser targets to the shortcut manager."" into oc-dev
Makoto Onuki [Mon, 3 Apr 2017 19:45:08 +0000 (19:45 +0000)]
Merge "Revert "Push chooser targets to the shortcut manager."" into oc-dev

7 years agoUpdate display contents when metrics change
Andrii Kulian [Fri, 24 Mar 2017 01:31:59 +0000 (18:31 -0700)]
Update display contents when metrics change

There are two separate overrides for display metrics in DisplayManager
and WindowManager:
- In DM - LogicalDisplay#mOverrideDisplayInfo, in most cases not null.
- In WM - DisplayContent#mBaseDisplayWidth/Height/Density, different
from #mInitialDisplayWidth/Height/Density values when some metrics are
forced.

When display was resized its windows weren't updated because of
two problems: old LogicaDisplay#mOverrideDisplayInfo was preventing
WM from detecting the change and override (base) display metrics were
never updated by resize.

When display size changes:
- Before this CL:
DM receives DISPLAY_CHANGED event, it updates internal values and
WM is notified about them with a message. In most cases there is an
override obtained from WM and WM doesn't get new values from
LogicalDisplay#getDisplayInfoLocked().

- With this CL:
WM will requests real updated values from DM without any overrides
and will decide whether to apply them or not: if there is no override
in WM - it will apply values from WM, otherwise it will keep the
override. Also it will always update initial display metrics if there
is a real change detected.

Bug: 35258051
Bug: 34164473
Bug: 36518752
Test: android.server.cts.ActivityManagerDisplayTests
Test: #testDisplayResize
Test: #testForceDisplayMetrics
Change-Id: I2495c27797f11f9aaee4ea06648a8ccd29ac5b62

7 years agoAddress API concerns for isConcurrentVoiceAndDataAllowed and
pkanwar [Tue, 28 Mar 2017 23:40:28 +0000 (16:40 -0700)]
Address API concerns for isConcurrentVoiceAndDataAllowed and
OnReceiveUssdResponseCallback.

Bug: 35766890
Test: Existing tests.
Change-Id: I1ddbdadafa2611edb0ecfce53d5cf32434e5236c
(cherry picked from commit 89731a8389c9726172989f1677b76cc0f6a96f4f)

7 years agoMerge "Fix menu visibility while updating dismiss fraction." into oc-dev
Winson Chung [Mon, 3 Apr 2017 19:22:54 +0000 (19:22 +0000)]
Merge "Fix menu visibility while updating dismiss fraction." into oc-dev

7 years agoMerge "Add test API for if the device supports QS" into oc-dev
Jason Monk [Mon, 3 Apr 2017 19:11:36 +0000 (19:11 +0000)]
Merge "Add test API for if the device supports QS" into oc-dev

7 years agoRemove workaround for end() not supported in some app
Doris Liu [Mon, 3 Apr 2017 18:08:11 +0000 (11:08 -0700)]
Remove workaround for end() not supported in some app

BUG: 36241584
Test: Follow repro steps of comment #1 in the bug above

Change-Id: I1bf27a7cc9cc2bd398c372623d7978e838f1d8b2

7 years agoMake Color non-final because apps break...
Romain Guy [Mon, 3 Apr 2017 18:49:20 +0000 (11:49 -0700)]
Make Color non-final because apps break...

Bug: 36858735
Test: Manual run of crashing app
Change-Id: I3eb06260074ee6950bc91731e7093a26d7e32b49

7 years agoJavadoc fix for View.setTooltipText
Vladislav Kaznacheev [Thu, 30 Mar 2017 00:14:37 +0000 (17:14 -0700)]
Javadoc fix for View.setTooltipText

Change "unless is not handled" to "unless it is handled"

Bug: 36668465
Test: read the Javadoc
Change-Id: I432f24e313358b4448aff2ff9de382d4a58652bc

7 years agoHandle edge-case where the focus-search root is focused
Evan Rosky [Mon, 3 Apr 2017 18:37:20 +0000 (11:37 -0700)]
Handle edge-case where the focus-search root is focused

Bug: 36854948
Test: Added check to FocusFinderTest#testFindNextFocus
Change-Id: Iac6ea6e255d16d4cd1f7fe053ba47e171fff73e0

7 years agoWhitelist DMAgent from bg check
Tony Mak [Mon, 3 Apr 2017 17:39:45 +0000 (18:39 +0100)]
Whitelist DMAgent from bg check

This should be reverted before O is shipped.

Test: Found DMAgent in the whitelist in Settings.

Bug: 36856786

Change-Id: I7828566e4bc93a30457c594471fa43270c0bf3b3

7 years agoRename UsbRequest.enqueue to UsbRequest.queue
Philip P. Moltmann [Mon, 3 Apr 2017 16:35:34 +0000 (09:35 -0700)]
Rename UsbRequest.enqueue to UsbRequest.queue

Fixes: 36850572
Test: CtsVerifier USB device tests on angler
Change-Id: If2a376a8615bf2aa24a6d3a30c7d0a29365f52ea

7 years agoMerge "Add friction icon for metered networks." into oc-dev
TreeHugger Robot [Mon, 3 Apr 2017 18:23:56 +0000 (18:23 +0000)]
Merge "Add friction icon for metered networks." into oc-dev

7 years agoMerge "Ensuring multi-window callbacks contain new configuration and are in order...
Winson Chung [Mon, 3 Apr 2017 18:23:24 +0000 (18:23 +0000)]
Merge "Ensuring multi-window callbacks contain new configuration and are in order" into oc-dev

7 years agoMerge "Fixing regression in PiP TV." into oc-dev
Winson Chung [Mon, 3 Apr 2017 18:22:35 +0000 (18:22 +0000)]
Merge "Fixing regression in PiP TV." into oc-dev

7 years agoMerge "Move CALL_PRIVILEGED/EMERGENCY to @SystemApi" into oc-dev
Brad Ebinger [Mon, 3 Apr 2017 18:12:37 +0000 (18:12 +0000)]
Merge "Move CALL_PRIVILEGED/EMERGENCY to @SystemApi" into oc-dev

7 years agoFix menu visibility while updating dismiss fraction.
Winson Chung [Mon, 3 Apr 2017 17:44:57 +0000 (10:44 -0700)]
Fix menu visibility while updating dismiss fraction.

Bug: 36225602
Test: Enter PIP, move, tap field to show IME
Change-Id: Idf47728a2fa40703e4e68b2cc0925167b8e80c0c

7 years agoMerge "Rename READ_PHONE_NUMBER to READ_PHONE_NUMBERS" into oc-dev
Chad Brubaker [Mon, 3 Apr 2017 17:34:03 +0000 (17:34 +0000)]
Merge "Rename READ_PHONE_NUMBER to READ_PHONE_NUMBERS" into oc-dev

7 years agoMerge "Fix some WM unit tests" into oc-dev
Andrii Kulian [Mon, 3 Apr 2017 17:33:56 +0000 (17:33 +0000)]
Merge "Fix some WM unit tests" into oc-dev

7 years agoMerge "Use KB instead of kB." into oc-dev
Daniel Nishi [Mon, 3 Apr 2017 17:25:09 +0000 (17:25 +0000)]
Merge "Use KB instead of kB." into oc-dev

7 years agoMake some intents public in SubscriptionManager.
Sanket Padawe [Fri, 31 Mar 2017 19:39:50 +0000 (12:39 -0700)]
Make some intents public in SubscriptionManager.

+ As per https://docs.google.com/document/d/1K8C7Ly8YVu032FQlwEdkv3ovcTYQCTvy0PaMax5PmZI/edit#heading=h.g6rt8vhyfjj1

Bug: 36572866
Test: Builds successfully.
Change-Id: Ibb1d1faae9a002ccb530446e24897955c12076e1

7 years agoWarn if IMM#showSoftInputUnchecked() is called
Yohei Yukawa [Fri, 31 Mar 2017 21:28:18 +0000 (14:28 -0700)]
Warn if IMM#showSoftInputUnchecked() is called

With this CL, an @hide method InputMethodManager#showSoftInputUnchecked
is marked to be deprecated and starts showing a warning message in logcat
when it gets called to tell application developers who are still using
old implementation fo android.support.v7.widget.SearchView that they
need to switch to support library ver. 26.0 or later version.

Other than that there is no behavior change in this CL.

Test: Manually verified as follows:
       1. Flash an OS image
       2. Complete the setup wizard (if any).
       3. In N MR-1 AOSP repository
          frameworks/support/gradlew -p frameworks/support support-v7-demos:assemble
       4. adb install out/host/gradle/frameworks/support/support-v7-demos/build/outputs/apk/support-v7-demos-debug.apk
       5. adb logcat -s InputMethodManager
       6. adb shell am start -n com.example.android.supportv7/.Support7Demos
       7. Tap AppCompat -> Action Bar -> Action Bar Usage
       8. Tap the magnifier icon.
       9. Make sure that the software keyboard shows up.
      10. Make sure that in logcat a warning that showSoftInputUnchecked
          is going to be removed is shown.
Fixes: 36015425
Change-Id: If01316a0c2a210f9ea03b53700d0ef651955ba9c

7 years agoMerge "Fix deleting Misc channel for o-aps" into oc-dev
TreeHugger Robot [Mon, 3 Apr 2017 16:53:49 +0000 (16:53 +0000)]
Merge "Fix deleting Misc channel for o-aps" into oc-dev

7 years agoMerge "Expose instant app to exposed providers" into oc-dev
TreeHugger Robot [Mon, 3 Apr 2017 16:43:02 +0000 (16:43 +0000)]
Merge "Expose instant app to exposed providers" into oc-dev

7 years agoMerge "Disable sounds on menu button" into oc-dev
TreeHugger Robot [Mon, 3 Apr 2017 16:37:44 +0000 (16:37 +0000)]
Merge "Disable sounds on menu button" into oc-dev

7 years agoMerge "Fix battery icon dark initialization" into oc-dev
TreeHugger Robot [Mon, 3 Apr 2017 16:37:07 +0000 (16:37 +0000)]
Merge "Fix battery icon dark initialization" into oc-dev

7 years agoMerge "Allow committing allowing state loss on detached FragmentManager." into oc-dev
TreeHugger Robot [Mon, 3 Apr 2017 16:34:12 +0000 (16:34 +0000)]
Merge "Allow committing allowing state loss on detached FragmentManager." into oc-dev

7 years agoFixing regression in PiP TV.
Winson Chung [Sat, 1 Apr 2017 02:42:32 +0000 (19:42 -0700)]
Fixing regression in PiP TV.

- Don't clobber the state if we are deferring resizing due to finishing
  activities.
- Fix issue with PiP tasks being visible after the stack is removed, due
  to it being put below a non-fullscreen task in the fullscreen stack.
  Instead just move it to the back of the stack.

Bug: 36592307
Test: android.server.cts.ActivityManagerPinnedStackTests

Change-Id: Ia18fe155b8a045a8ffea84612fd08af3ef3982d8

7 years agoNot send switch intents if there is no real intent
Philip P. Moltmann [Fri, 31 Mar 2017 19:42:52 +0000 (12:42 -0700)]
Not send switch intents if there is no real intent

When resolving activtities for the USB device/accessory connection UI a
special intent that allows to switch between profiles get added. This
also gets added if there is no activity in the secondary profile that
can be started.

Fixes: 36544815
Test: Added work profile. Add USB handling app only to personal profile
      and plugged in USB device -> no crash anymore

Change-Id: I311ddd53b3ff0c8406e62bac57972d4b790ebddc

7 years agoMerge "Fix broken perf tests" into oc-dev
TreeHugger Robot [Mon, 3 Apr 2017 15:57:34 +0000 (15:57 +0000)]
Merge "Fix broken perf tests" into oc-dev

7 years agoMerge "QS: Add transient animations for bluetooth and wifi" into oc-dev
TreeHugger Robot [Mon, 3 Apr 2017 15:37:13 +0000 (15:37 +0000)]
Merge "QS: Add transient animations for bluetooth and wifi" into oc-dev

7 years agoMerge "Fix losing status bar icons on config changes" into oc-dev
TreeHugger Robot [Mon, 3 Apr 2017 15:05:34 +0000 (15:05 +0000)]
Merge "Fix losing status bar icons on config changes" into oc-dev

7 years agoMerge "Implement service filtering" into oc-dev
TreeHugger Robot [Mon, 3 Apr 2017 14:45:52 +0000 (14:45 +0000)]
Merge "Implement service filtering" into oc-dev

7 years agoMerge "Add app bounds to configuration." into oc-dev
Bryce Lee [Mon, 3 Apr 2017 14:30:42 +0000 (14:30 +0000)]
Merge "Add app bounds to configuration." into oc-dev

7 years agoFix deleting Misc channel for o-aps
Geoffrey Pitsch [Mon, 3 Apr 2017 14:19:11 +0000 (10:19 -0400)]
Fix deleting Misc channel for o-aps

Change-Id: If5ebebcd1b983e12dee860801db578dfe882bd9c
Fixes: 36816111
Test: runtest systemui-notification

7 years agoFix broken perf tests
Diego Perez [Mon, 27 Mar 2017 15:49:17 +0000 (16:49 +0100)]
Fix broken perf tests

Do not dispose Bridge on tearDown. The concept of disposing the Bridge
only made sense when we were loading it dynamically. Some classes have
static initializers that will fail after the dispose (like Typeface).

Test: N/A
Change-Id: I9c934432232bda02a4d26425587096fb6dc957b0
(cherry picked from commit f1532e36e16e2b55f175a24f11df91cf344833ff)

7 years agoMerge "standardize network policy notification IDs" into oc-dev
Chris Wren [Mon, 3 Apr 2017 13:42:38 +0000 (13:42 +0000)]
Merge "standardize network policy notification IDs" into oc-dev

7 years agoHandle case when snapshot dimensions don't match
Jorim Jaggi [Tue, 21 Mar 2017 16:36:26 +0000 (17:36 +0100)]
Handle case when snapshot dimensions don't match

If the snapshot starting window has different dimensions than the
snapshots we have taken, we do the following:

- Create a child Surface that has exactly the dimensions of the
snapshot.
- We fill the parent surface with the app background color, as well
as all screen background decorations (status bar background,
navigation bar background).
- We also clip of the status bar/navigation bar background in some
cases, as it looks ugly if it's not behind the system bars.
- Furthermore, we inherit all layout flags on the window and all
layout relevant SystemUI flags on the window such that it's very
likely that the size will match, and the system bars are drawn
correctly.
- In order to make the transition from the snapshot to the real
window a bit more predictable/less messy, we enforce a minimum
duration the snapshot is visible, which is slightly more than our
app transitions.

Test: TaskSnapshotSurfaceTest
Test: Open app, go home, go landscape, open app again
Test: Go to multi-window, open app from recents with a snapshot
taken in fullscreen.

Fixes: 36703868
Change-Id: Ia2d4add6971a18ab7aa2942d2b644d6e87a402af