OSDN Git Service

android-x86/frameworks-base.git
7 years agoTreat apps that use channels as O apps
Julia Reynolds [Mon, 1 May 2017 13:20:30 +0000 (09:20 -0400)]
Treat apps that use channels as O apps

... even if they don't target O

- Delete misc channel
- Read settings from channel instead of notification

Test: runtest systemui-notification
Change-Id: I00814959eddd10998806dd67cc30421091ae9aab
Fixes: 37540996
Fixes: 35378789

7 years agoSorting and intrusiveness updates
Julia Reynolds [Tue, 2 May 2017 19:04:34 +0000 (15:04 -0400)]
Sorting and intrusiveness updates

- The intrusiveness extractor needs to know about channels
- Allow comparisons by contact affinity even in the min bucket.

Test: cts-verifier, attention management test
Bug: 36197567
Change-Id: I1bb53d758fc2334aad5e380620fc6e39a724195c

7 years agoMerge "Fix lock contention: Call into power manager service from handler" into oc-dev
TreeHugger Robot [Wed, 3 May 2017 13:16:27 +0000 (13:16 +0000)]
Merge "Fix lock contention: Call into power manager service from handler" into oc-dev

7 years agoMerge "Delete default channel for all apps targeting O." into oc-dev
Geoffrey Pitsch [Wed, 3 May 2017 13:15:16 +0000 (13:15 +0000)]
Merge "Delete default channel for all apps targeting O." into oc-dev

7 years agoMerge "Avoid classifying text mulitple times." into oc-dev
TreeHugger Robot [Wed, 3 May 2017 12:35:17 +0000 (12:35 +0000)]
Merge "Avoid classifying text mulitple times." into oc-dev

7 years agoFix lock contention: Call into power manager service from handler
Jorim Jaggi [Tue, 2 May 2017 16:02:46 +0000 (18:02 +0200)]
Fix lock contention: Call into power manager service from handler

Make sure to not hold the wm lock when calling into power manager
service, because PWM will acquire a lock that might be contended.

Test: Make sure user activity timeout is still respected on
Keyguard
Test: Have activity with screenBrightness=1.0, make sure screen
is fully bright when opened

Bug: 37888898
Bug: 36631902
Change-Id: I4b5433dbaf8aa151465ae32232d3b3b8597715df

7 years agoMerge "Move text coretests to JUnit (1)" into oc-dev
TreeHugger Robot [Wed, 3 May 2017 09:42:01 +0000 (09:42 +0000)]
Merge "Move text coretests to JUnit (1)" into oc-dev

7 years agoMerge "Move text coretests to JUnit (2)" into oc-dev
TreeHugger Robot [Wed, 3 May 2017 09:41:30 +0000 (09:41 +0000)]
Merge "Move text coretests to JUnit (2)" into oc-dev

7 years agoMerge "Update frameworks/base to new compiler filters." into oc-dev
Nicolas Geoffray [Wed, 3 May 2017 08:04:28 +0000 (08:04 +0000)]
Merge "Update frameworks/base to new compiler filters." into oc-dev

7 years agoMerge "Fix VideoView touch and trackball handlers to call super." into oc-dev
TreeHugger Robot [Wed, 3 May 2017 07:31:44 +0000 (07:31 +0000)]
Merge "Fix VideoView touch and trackball handlers to call super." into oc-dev

7 years agoMerge "Updating network info state should return true." into oc-dev
Sundeep Ghuman [Wed, 3 May 2017 04:24:38 +0000 (04:24 +0000)]
Merge "Updating network info state should return true." into oc-dev

7 years agoMerge "Fix Bluetooth GATT API default handler assignment" into oc-dev
TreeHugger Robot [Wed, 3 May 2017 03:48:19 +0000 (03:48 +0000)]
Merge "Fix Bluetooth GATT API default handler assignment" into oc-dev

7 years agoMerge "Remove snippet regarding ContentProvider#notifyChange in documentation." into...
Ben Lin [Wed, 3 May 2017 02:25:03 +0000 (02:25 +0000)]
Merge "Remove snippet regarding ContentProvider#notifyChange in documentation." into oc-dev

7 years agoMerge "Don't add other's child as header or footer" into oc-dev
TreeHugger Robot [Wed, 3 May 2017 02:12:03 +0000 (02:12 +0000)]
Merge "Don't add other's child as header or footer" into oc-dev

7 years agoMerge "Optionally let the instant app into disambig" into oc-dev
TreeHugger Robot [Wed, 3 May 2017 02:06:29 +0000 (02:06 +0000)]
Merge "Optionally let the instant app into disambig" into oc-dev

7 years agoMerge "More work on issue #36891897: Need to ensure foreground..." into oc-dev
Dianne Hackborn [Wed, 3 May 2017 01:46:25 +0000 (01:46 +0000)]
Merge "More work on issue #36891897: Need to ensure foreground..." into oc-dev

7 years agoUpdating network info state should return true.
Sundeep Ghuman [Fri, 21 Apr 2017 04:25:41 +0000 (21:25 -0700)]
Updating network info state should return true.

Update AccessPoint.java so that network state changes return updated
equals true, so that corresponding UI elements will updated
appropriately.

Bug: b/37289220
Test: runtest --path
packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/AccessPointTest.java

Change-Id: I1bc74997227b46468ef11efbf183a95ec0d2b15f

7 years agoFix Bluetooth GATT API default handler assignment
Ruben Brunk [Mon, 1 May 2017 23:57:31 +0000 (16:57 -0700)]
Fix Bluetooth GATT API default handler assignment

Restores previous behaviour where GATT callbacks are invoked on the
binder thread and not the calling process main looper thread.

This fixes performance regressions as well as some
NetworkOnMainThreadException's for some applications.

Bug: 37544152
Bug: 37871717
Test: Covered by prior API tests.
Change-Id: Id8ab705dd4d7f00030e6ac29e056dde5180670e9

7 years agoOptionally let the instant app into disambig
Todd Kennedy [Wed, 26 Apr 2017 19:58:28 +0000 (12:58 -0700)]
Optionally let the instant app into disambig

When a user clicks "view on web", it's not assumed this is meant to be
forever. In this case, we will adjust the instant app's verification
status so that the instant isn't automatically run.

Change-Id: I246de901dafb23159a064d205fdb614d657a99dc
Fixes: 37686922
Test: Manual
Test: 1) Install instant app
Test: 2) Set to always-ask -- adb shell pm set-app-link package.name always-ask
Test: 3) Notice that we get a disambig w/ the instant app and chrome as options
Test: 4) Set to never -- adb shell pm set-app-link package.name never
Test: 5) Notice that we don't get the instant app

7 years agoMerge "Update ime touch exclude region for hosting display" into oc-dev
Andrii Kulian [Wed, 3 May 2017 00:03:25 +0000 (00:03 +0000)]
Merge "Update ime touch exclude region for hosting display" into oc-dev

7 years agoMerge changes from topic 'frankenbuild' into oc-dev
TreeHugger Robot [Tue, 2 May 2017 23:59:46 +0000 (23:59 +0000)]
Merge changes from topic 'frankenbuild' into oc-dev

* changes:
  Revert "Resource ID fixup."
  Resource ID fixup.

7 years agoMerge "Add more information to WTF to investigate bug 37809561" into oc-dev
TreeHugger Robot [Tue, 2 May 2017 23:51:33 +0000 (23:51 +0000)]
Merge "Add more information to WTF to investigate bug 37809561" into oc-dev

7 years agoMerge "Skip Pip animation to fullscreen if orientation is going to change" into oc-dev
TreeHugger Robot [Tue, 2 May 2017 23:41:26 +0000 (23:41 +0000)]
Merge "Skip Pip animation to fullscreen if orientation is going to change" into oc-dev

7 years agoMerge "Restoring old methods for compatibility." into oc-dev
Winson Chung [Tue, 2 May 2017 23:19:24 +0000 (23:19 +0000)]
Merge "Restoring old methods for compatibility." into oc-dev

7 years agoMerge "Added Channel for Network Initiated Notifications" into oc-dev
Siddharth Ray [Tue, 2 May 2017 23:13:01 +0000 (23:13 +0000)]
Merge "Added Channel for Network Initiated Notifications" into oc-dev

7 years agoRestoring old methods for compatibility.
Winson Chung [Tue, 2 May 2017 22:14:23 +0000 (15:14 -0700)]
Restoring old methods for compatibility.

Bug: 37637423
Test: Build and test PIP apps
Change-Id: I9ccb49a3e42de55a249ab54bde2f3c5a1c179c1c

7 years agoMerge "O is API 26" into oc-dev
TreeHugger Robot [Tue, 2 May 2017 22:11:53 +0000 (22:11 +0000)]
Merge "O is API 26" into oc-dev

7 years agoSkip Pip animation to fullscreen if orientation is going to change
Wale Ogunwale [Tue, 2 May 2017 04:32:58 +0000 (21:32 -0700)]
Skip Pip animation to fullscreen if orientation is going to change

Having this kind of animation look good is extremely difficult.
The best we can do is skip the animation and just go to fullscreen
if we know the device orientation is going to change because the
current screen configuration isn't compatible with the fixed
orientation requested by the app going fullscreen.

Change-Id: I97b14723a0d678c05efedc93fe692ad3b3212a72
Fixes: 37722472
Test: manual

7 years agoMerge "Adding voicemail transcription state to the database" into oc-dev
Michael Dooley [Tue, 2 May 2017 22:01:12 +0000 (22:01 +0000)]
Merge "Adding voicemail transcription state to the database" into oc-dev

7 years agoUpdate ime touch exclude region for hosting display
Andrii Kulian [Tue, 2 May 2017 20:22:42 +0000 (13:22 -0700)]
Update ime touch exclude region for hosting display

If IME for an application is situated on a different display,
then we need to update corresponding display content's touch
exclude region.

Bug: 36515606
Test: Manual, b/37911363
Change-Id: I43785de6f26adf88e9a76b9144b39f66f232a646

7 years agoMerge "Don't focus search user-specified views which are invisible" into oc-dev
Evan Rosky [Tue, 2 May 2017 20:54:00 +0000 (20:54 +0000)]
Merge "Don't focus search user-specified views which are invisible" into oc-dev

7 years agoAdded Channel for Network Initiated Notifications
Siddharth Ray [Mon, 1 May 2017 20:29:04 +0000 (13:29 -0700)]
Added Channel for Network Initiated Notifications

Bug=37659896

Change-Id: I1c04a9455c320330efbcb92c352fc31b16ed8378

7 years agoRevert "Resource ID fixup."
Michael Wright [Tue, 2 May 2017 20:35:28 +0000 (21:35 +0100)]
Revert "Resource ID fixup."

This reverts commit e6d161554f4cb84a6a5410b2b7e9ed5348bdf96d.

Bug: 37480230
Test: build
Change-Id: I2322c34132c5c8761d7506b00b2a8cdd286a5e48

7 years agoResource ID fixup.
Michael Wright [Tue, 2 May 2017 19:00:10 +0000 (20:00 +0100)]
Resource ID fixup.

Remove unused resources and assign IDs to the remaining ones.

Bug: 37480230
Test: build
Change-Id: Ife792e38ae1b7b2bf6b176a52929bc3e1fa16060

7 years agoRemove snippet regarding ContentProvider#notifyChange in documentation.
Ben Lin [Tue, 2 May 2017 20:32:27 +0000 (13:32 -0700)]
Remove snippet regarding ContentProvider#notifyChange in documentation.

For ContentProvider and DocumentsProvider, throwing an exception in
their query methods will result in no Cursor returned to the remote
side. Without a cursor, there is no way to listen in on changes.
Removing the part regarding notifyChange since there's no established
paradigm on which URI to listen/notify changes on.

Test: Documentation change only.
Bug: 37876119
Change-Id: I0739794a1e8182918758ba953251ed9a3268f227

7 years agoMerge "Disable flaky DisplayContentTests#testFocusedWindowMultipleDisplays" into...
Wale Ogunwale [Tue, 2 May 2017 20:23:43 +0000 (20:23 +0000)]
Merge "Disable flaky DisplayContentTests#testFocusedWindowMultipleDisplays" into oc-dev

7 years agoDisable flaky DisplayContentTests#testFocusedWindowMultipleDisplays
Wale Ogunwale [Tue, 2 May 2017 20:16:39 +0000 (13:16 -0700)]
Disable flaky DisplayContentTests#testFocusedWindowMultipleDisplays

Reduce pre-submit noise. We can re-enable once we figure-out why it
is flaky.

Bug: 37908381
Test: disabled!
Change-Id: Ia82ba73fafafc433487027f2ee2d582dceb65ed2

7 years agoDelete default channel for all apps targeting O.
Geoffrey Pitsch [Mon, 17 Apr 2017 15:33:24 +0000 (11:33 -0400)]
Delete default channel for all apps targeting O.

Change toast to be for debuggable builds only.

Bug: 35378789
Test: runtest systemui-notification
Change-Id: I36247b003ead00bf1f9f3bed9c1a38a53db18c71

7 years agoMerge "Support resetting "smart selection" to any word in the selection." into oc-dev
TreeHugger Robot [Tue, 2 May 2017 20:05:42 +0000 (20:05 +0000)]
Merge "Support resetting "smart selection" to any word in the selection." into oc-dev

7 years agoMerge "Fix cancel when the same notification is enqueued twice." into oc-dev
TreeHugger Robot [Tue, 2 May 2017 20:02:13 +0000 (20:02 +0000)]
Merge "Fix cancel when the same notification is enqueued twice." into oc-dev

7 years agoMerge "Add commandline option to update power-save-except-idle whitelist." into oc-dev
Sudheer Shanka [Tue, 2 May 2017 19:56:59 +0000 (19:56 +0000)]
Merge "Add commandline option to update power-save-except-idle whitelist." into oc-dev

7 years agoAvoid classifying text mulitple times.
Abodunrinwa Toki [Tue, 2 May 2017 19:32:23 +0000 (20:32 +0100)]
Avoid classifying text mulitple times.

Test: bit FrameworksCoreTests:android.widget.TextViewActivityTest
Bug: 34966796
Change-Id: I278dc5f1ca684ff0f336c05f14f5b42196738ba7

7 years agoMerge "Message about audio stream deprecation as warning" into oc-dev
TreeHugger Robot [Tue, 2 May 2017 19:13:19 +0000 (19:13 +0000)]
Merge "Message about audio stream deprecation as warning" into oc-dev

7 years agoMerge "Removing check preventing pinned stack tasks from matching by affinity." into...
Winson Chung [Tue, 2 May 2017 19:07:24 +0000 (19:07 +0000)]
Merge "Removing check preventing pinned stack tasks from matching by affinity." into oc-dev

7 years agoMerge "Make PM#notifyDexLoad oneway" into oc-dev
Calin Juravle [Tue, 2 May 2017 19:03:18 +0000 (19:03 +0000)]
Merge "Make PM#notifyDexLoad oneway" into oc-dev

7 years agoAdd more information to WTF to investigate bug 37809561
Makoto Onuki [Tue, 2 May 2017 19:02:23 +0000 (12:02 -0700)]
Add more information to WTF to investigate bug 37809561

Bug 37809561
Test: Build & boot -- didn't actually exercise the WTF case but it should work
since getStackTraceString accepts null too.

Change-Id: Iabfbe1fcde293fec919c65df7ea9650e1b247b9a

7 years agoMerge "Close file descriptor after SmartSelection is initialized." into oc-dev
TreeHugger Robot [Tue, 2 May 2017 18:54:59 +0000 (18:54 +0000)]
Merge "Close file descriptor after SmartSelection is initialized." into oc-dev

7 years agoO is API 26
Michael Wright [Tue, 2 May 2017 18:23:12 +0000 (19:23 +0100)]
O is API 26

Bug: 37480230
Test: build, boot
Change-Id: Idfa91e1e094606f92c4141beb8569c241c639ee1

7 years agoMerge "Audio focus: fix notifying apps to pause without an external policy" into...
Jean-Michel Trivi [Tue, 2 May 2017 17:52:32 +0000 (17:52 +0000)]
Merge "Audio focus: fix notifying apps to pause without an external policy" into oc-dev

7 years agoMerge "Work on issue #37815224: DeviceManagementService is incorrectly..." into oc-dev
Dianne Hackborn [Tue, 2 May 2017 17:45:46 +0000 (17:45 +0000)]
Merge "Work on issue #37815224: DeviceManagementService is incorrectly..." into oc-dev

7 years agoSupport resetting "smart selection" to any word in the selection.
Abodunrinwa Toki [Tue, 2 May 2017 17:44:19 +0000 (18:44 +0100)]
Support resetting "smart selection" to any word in the selection.

Test: See topic
Bug: 34779207
Change-Id: I75a9b991571f750b362047baa13675250e929223

7 years agoFix cancel when the same notification is enqueued twice.
Geoffrey Pitsch [Tue, 2 May 2017 15:41:31 +0000 (11:41 -0400)]
Fix cancel when the same notification is enqueued twice.

Change-Id: I6563c70ac441ff1c1951d5220c2e6a7c5f210d49
Fixes: 37706685
Test: runtest systemui-notification

7 years agoMerge "Fix NPE happens if no source was specified to font element." into oc-dev
TreeHugger Robot [Tue, 2 May 2017 17:22:58 +0000 (17:22 +0000)]
Merge "Fix NPE happens if no source was specified to font element." into oc-dev

7 years agoMerge "Clear calling uid before changing whitelist" into oc-dev
Amith Yamasani [Tue, 2 May 2017 17:20:31 +0000 (17:20 +0000)]
Merge "Clear calling uid before changing whitelist" into oc-dev

7 years agoClose file descriptor after SmartSelection is initialized.
Abodunrinwa Toki [Fri, 28 Apr 2017 18:25:24 +0000 (19:25 +0100)]
Close file descriptor after SmartSelection is initialized.

Test: bit FrameworksCoreTests:android.view.textclassifier.TextClassificationManagerTest
Bug: 37446398
Change-Id: I6f6d927f447d3cc1dffaee2406ff240d0600eb19

7 years agoMerge "Fix app transition logging when switching quickly" into oc-dev
TreeHugger Robot [Tue, 2 May 2017 17:14:57 +0000 (17:14 +0000)]
Merge "Fix app transition logging when switching quickly" into oc-dev

7 years agoMerge "Don't crash during app uninstall." into oc-dev
Daniel Nishi [Tue, 2 May 2017 17:03:51 +0000 (17:03 +0000)]
Merge "Don't crash during app uninstall." into oc-dev

7 years agoMessage about audio stream deprecation as warning
Jean-Michel Trivi [Tue, 2 May 2017 17:01:08 +0000 (10:01 -0700)]
Message about audio stream deprecation as warning

The message indicating the use of stream types for operations
  other than volume control is deprecated shouldn't be an
  error but a warning

Test: use apps that request audio focus with a stream type, check log
Bug: 37887058
Change-Id: Iaafae8aa599984688dae448e868de81317add4d3

7 years agoFix VideoView touch and trackball handlers to call super.
Vladislav Kaznacheev [Tue, 2 May 2017 16:39:06 +0000 (09:39 -0700)]
Fix VideoView touch and trackball handlers to call super.

Currently VideoView.onTouchEvent and VideoView.onTrackballEvent do not
call super. This completely disables several useful View features
such as long click, context menu or tooltips.

Bug: 37755662
Test: manual
Change-Id: I0c82c32da36e4ca7cacc78027daed2fa298a6b58

7 years agoMerge "Add "Paste as plain text" in TextView's toolbar." into oc-dev
TreeHugger Robot [Tue, 2 May 2017 16:21:10 +0000 (16:21 +0000)]
Merge "Add "Paste as plain text" in TextView's toolbar." into oc-dev

7 years agoMerge "DO NOT MERGE Adjust WALLPAPER_RECONNECT_TIMEOUT_MS in WallpaperManagerService...
Android Build Merger (Role) [Tue, 2 May 2017 16:00:52 +0000 (16:00 +0000)]
Merge "DO NOT MERGE Adjust WALLPAPER_RECONNECT_TIMEOUT_MS in WallpaperManagerService to 15s am: a686345759 am: a399705286  -s ours" into oc-dev

7 years agoDO NOT MERGE Adjust WALLPAPER_RECONNECT_TIMEOUT_MS in WallpaperManagerService to...
Erik Wolsheimer [Tue, 2 May 2017 15:59:43 +0000 (15:59 +0000)]
DO NOT MERGE Adjust WALLPAPER_RECONNECT_TIMEOUT_MS in WallpaperManagerService to 15s am: a686345759
am: a399705286  -s ours

Change-Id: I654fc19afef7f11d894590d287cde3650b8252af

7 years agoMerge "SurfaceTexture: setConsumerIsProtected" into oc-dev
Jiwen Cai [Tue, 2 May 2017 15:59:21 +0000 (15:59 +0000)]
Merge "SurfaceTexture: setConsumerIsProtected" into oc-dev

7 years agoMove text coretests to JUnit (2)
Andrei Stingaceanu [Fri, 28 Apr 2017 13:48:17 +0000 (14:48 +0100)]
Move text coretests to JUnit (2)

* moves android.text.util, android.text.format and
android.text.method packages core tests to AndroidJUnit
* replaced manual mocks with mockito usage
* cleaned up dead code

Bug: 31223263
Test: adb shell am instrument -w -e package android.text\
      com.android.frameworks.coretests/android.support.test.runner\
      .AndroidJUnitRunner

Change-Id: I7b13c10521381e4f26ca8e6189392914238a21dd

7 years agoDO NOT MERGE Adjust WALLPAPER_RECONNECT_TIMEOUT_MS in WallpaperManagerService to 15s
Erik Wolsheimer [Tue, 2 May 2017 15:54:40 +0000 (15:54 +0000)]
DO NOT MERGE Adjust WALLPAPER_RECONNECT_TIMEOUT_MS in WallpaperManagerService to 15s
am: a686345759

Change-Id: I0598c6210dbf0d0447c31112419a2fee829037be

7 years agoMerge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Tue, 2 May 2017 15:49:24 +0000 (15:49 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev

7 years agoMerge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Tue, 2 May 2017 15:47:33 +0000 (15:47 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev

7 years agoMerge "Fix submenu position when showing with Gravity.END" into oc-dev
TreeHugger Robot [Tue, 2 May 2017 15:40:37 +0000 (15:40 +0000)]
Merge "Fix submenu position when showing with Gravity.END" into oc-dev

7 years agoMerge "Add back the throwIfParentInstance checking in getAffiliationIds" into oc-dev
TreeHugger Robot [Tue, 2 May 2017 15:38:44 +0000 (15:38 +0000)]
Merge "Add back the throwIfParentInstance checking in getAffiliationIds" into oc-dev

7 years agoMove text coretests to JUnit (1)
Andrei Stingaceanu [Mon, 24 Apr 2017 15:53:17 +0000 (16:53 +0100)]
Move text coretests to JUnit (1)

* moved android.text package core tests to AndroidJUnit
* replaced manual mocks with mockito
* removed redundant "throws Exception" in all touched
  files

Bug: 31223263
Test: adb shell am instrument -w -e package android.text\
      com.android.frameworks.coretests/android.support.test.runner\
      .AndroidJUnitRunner

Change-Id: I6ae08df24064720635c4acc0d9085a539a317ac0

7 years agoFix app transition logging when switching quickly
Jorim Jaggi [Fri, 28 Apr 2017 17:06:24 +0000 (19:06 +0200)]
Fix app transition logging when switching quickly

If an app was set to invisible before the transition started,
which happens when quickly open an app and then closing again
before the animation is starting (only possible if starting
window is slightly delayed), we never receive onWindowsDrawn so we
need to cancel the transition in this case.

Also fixes an issue where the wrong activity was reported as
starting to us in case reusedActivity != null but we'll only reuse
it for the task and not the actual activity.

Test: Open Calendar, press home immediately, open another app, make
sure all logged events and times are correct.
Fixes: 37538546

Change-Id: I5819bd97964ab2dd5cb40b2f4e3bc5a9ac348152

7 years agoMerge "Split out whether frame callback and tick is scheduled" into oc-dev
TreeHugger Robot [Tue, 2 May 2017 14:58:15 +0000 (14:58 +0000)]
Merge "Split out whether frame callback and tick is scheduled" into oc-dev

7 years agoAdd "Paste as plain text" in TextView's toolbar.
Abodunrinwa Toki [Fri, 28 Apr 2017 21:14:13 +0000 (22:14 +0100)]
Add "Paste as plain text" in TextView's toolbar.

Test: bit FrameworksCoreTests:android.widget.TextViewActivityTest
Bug: 36179795
Change-Id: Iee0502678adcfb9de58c107b9247a528718b2c40

7 years agoMerge "Don't send configuration that app doesn't support to it." into oc-dev
TreeHugger Robot [Tue, 2 May 2017 13:58:55 +0000 (13:58 +0000)]
Merge "Don't send configuration that app doesn't support to it." into oc-dev

7 years agoAdd back the throwIfParentInstance checking in getAffiliationIds
Tony Mak [Tue, 2 May 2017 12:50:18 +0000 (13:50 +0100)]
Add back the throwIfParentInstance checking in getAffiliationIds

Fix: 37887947

Test: cts-tradefed run cts-dev --module DevicePolicyManager --test com.android.cts.devicepolicy.ParentProfileTest#testParentProfileApiDisabled

Change-Id: I05944c7a2447998d3ea948195fb25b09ab9735fc

7 years agoSplit out whether frame callback and tick is scheduled
Jorim Jaggi [Fri, 28 Apr 2017 14:39:19 +0000 (16:39 +0200)]
Split out whether frame callback and tick is scheduled

Since the animation/gesture for screen zoom is running at
vsync-app, calling WMS.scheduleAnimation will schedule only
at the next frame. However, in the next frame, only the frame
callback is handled but not the tick yet, however
mAnimationScheduled was still true. Thus, the request to schedule
another frame callback is ignored, and then the things get
updated only every 2nd frame.

Fix this by splitting the information whether the frame callback
is scheduled or the actual tick.

Test: Use accessibility screen zoom, make sure gestures are
smooth.
Fixes: 37476440

Change-Id: I2301fab5bf3f3b896d4aa131fb041b89572fa3a7

7 years agoUpdate frameworks/base to new compiler filters.
Nicolas Geoffray [Tue, 25 Apr 2017 11:29:07 +0000 (12:29 +0100)]
Update frameworks/base to new compiler filters.

Also fix a merge issue with duplicated code.

bug:34715556
Test: build and boot aosp bullhead

(cherry picked from commit be7b0d18a7d68aa79dc8256ee904f0a94767d5d9)

Change-Id: I2c716427ac10090a694ce933421e4924748b0c71

7 years agoImport translations. DO NOT MERGE
The Android Open Source Project [Tue, 2 May 2017 07:05:25 +0000 (00:05 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ia533546d474a51fa42205fa4ebf7ec122d17fa38
Auto-generated-cl: translation import

7 years agoMerge "Allow null setup activity for TV input" into oc-dev
TreeHugger Robot [Tue, 2 May 2017 06:56:48 +0000 (06:56 +0000)]
Merge "Allow null setup activity for TV input" into oc-dev

7 years agoFix NPE happens if no source was specified to font element.
Seigo Nonaka [Mon, 1 May 2017 21:24:32 +0000 (14:24 -0700)]
Fix NPE happens if no source was specified to font element.

This also fixes unexpected fallback to the old implemntation by calling
allowUnsupportedFont() which is only for backward compatibility.

This CL also remove getResourceId() method. Nobody uses this method.

Bug: 37865521
Bug: 37844248
Test: am instrument -w -e class android.content.res.cts.ResourcesTest\
      android.content.cts/android.support.test.runner.AndroidJUnitRunner
Change-Id: I987448add728c53c916f24a2ea8f337be417248f

7 years agoMerge "Add a method to start the captive portal login app." into oc-dev
Lorenzo Colitti [Tue, 2 May 2017 04:38:50 +0000 (04:38 +0000)]
Merge "Add a method to start the captive portal login app." into oc-dev

7 years agoMerge "Refactor accessibility button support detection" into oc-dev
Casey Burkhardt [Tue, 2 May 2017 04:05:26 +0000 (04:05 +0000)]
Merge "Refactor accessibility button support detection" into oc-dev

7 years agoMerge "TIF: change documentation wording for onSetSurface()" into oc-dev
TreeHugger Robot [Tue, 2 May 2017 03:26:29 +0000 (03:26 +0000)]
Merge "TIF: change documentation wording for onSetSurface()" into oc-dev

7 years agoMake PM#notifyDexLoad oneway
Calin Juravle [Tue, 2 May 2017 02:49:21 +0000 (19:49 -0700)]
Make PM#notifyDexLoad oneway

There's not need to wait for the PM to process the dex load
notification.

Make notifyPackageUse one way as well (for the same reason).

Bug: 37876265
Test: manual test to verify that notifications still work
Change-Id: I29d076348c2999a4441c2047a89a45b085bf3761

7 years agoMerge "Adding the AOSP header." into oc-dev
TreeHugger Robot [Tue, 2 May 2017 02:18:50 +0000 (02:18 +0000)]
Merge "Adding the AOSP header." into oc-dev

7 years agoMerge "Don't relaunch activity in TaskRecord.size if caller deferResume" into oc-dev
TreeHugger Robot [Tue, 2 May 2017 01:55:15 +0000 (01:55 +0000)]
Merge "Don't relaunch activity in TaskRecord.size if caller deferResume" into oc-dev

7 years agoMerge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Tue, 2 May 2017 01:48:15 +0000 (01:48 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev

7 years agoMerge "hotspot2: hide Release 2 APIs" into oc-dev
TreeHugger Robot [Tue, 2 May 2017 01:44:41 +0000 (01:44 +0000)]
Merge "hotspot2: hide Release 2 APIs" into oc-dev

7 years agoMerge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Tue, 2 May 2017 01:38:26 +0000 (01:38 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev

7 years agoMerge "Make auth fill UI size sane size" into oc-dev
TreeHugger Robot [Tue, 2 May 2017 01:33:24 +0000 (01:33 +0000)]
Merge "Make auth fill UI size sane size" into oc-dev

7 years agoImport translations. DO NOT MERGE
The Android Open Source Project [Tue, 2 May 2017 01:07:07 +0000 (18:07 -0700)]
Import translations. DO NOT MERGE

Change-Id: Iad23566a92d65a5dc0b703f0a2afcb602c0b6025
Auto-generated-cl: translation import

7 years agoMerge "Fix cropping in docked stack." into oc-dev
Rob Carr [Tue, 2 May 2017 01:03:44 +0000 (01:03 +0000)]
Merge "Fix cropping in docked stack." into oc-dev

7 years agoMerge "Fix rotation animation selection." into oc-dev
Rob Carr [Tue, 2 May 2017 01:01:29 +0000 (01:01 +0000)]
Merge "Fix rotation animation selection." into oc-dev

7 years agoMerge "Removed deprecated setAuthentication() method that didn't take ids." into...
TreeHugger Robot [Tue, 2 May 2017 00:53:30 +0000 (00:53 +0000)]
Merge "Removed deprecated setAuthentication() method that didn't take ids." into oc-dev

7 years agoAudio focus: fix notifying apps to pause without an external policy
Jean-Michel Trivi [Tue, 2 May 2017 00:51:14 +0000 (17:51 -0700)]
Audio focus: fix notifying apps to pause without an external policy

In the absence of an external audio policy that implements ducking,
   check whether the focus loser has the
   AUDIOFOCUS_FLAG_PAUSES_ON_DUCKABLE_LOSS flag: if yes, do not
   let the framework handle ducking, notify the app.

Test: use app that calls AudioFocusRequest.Builder.setWillPauseWhenDucked(true) and verify it doesn't get ducked by framework
Bug: 30258418
Change-Id: I12655b413504ed101dd14d2b60ffdaf16c5b6148

7 years agoDon't send configuration that app doesn't support to it.
Wale Ogunwale [Mon, 10 Apr 2017 13:35:59 +0000 (06:35 -0700)]
Don't send configuration that app doesn't support to it.

If an app doesn't support the current device orientation configuration,
then don't run the app in that configuration. Instead have the run in
the last configuration that it supports.
This mostly fixes transient cases where there is a short window that the
device is switching configuration and the app could be sent the single
incorrect configuration that is quickly corrected

Test: Will be added soon.
Fixes: 36897968
Change-Id: I030a04200fdf33c4c1938bda980ea8c14aa1c736

7 years agoMerge "AudioService: send AUDIO_BECOMING_NOISY intent when disconnecting USB" into...
TreeHugger Robot [Tue, 2 May 2017 00:45:39 +0000 (00:45 +0000)]
Merge "AudioService: send AUDIO_BECOMING_NOISY intent when disconnecting USB" into oc-dev

7 years agoMerge "Video badging levels: @Deprecate and @remove" into oc-dev
Jeff Sharkey [Tue, 2 May 2017 00:44:47 +0000 (00:44 +0000)]
Merge "Video badging levels: @Deprecate and @remove" into oc-dev

7 years agoAdding the AOSP header.
Jeremy Joslin [Tue, 25 Apr 2017 22:43:13 +0000 (15:43 -0700)]
Adding the AOSP header.

Test: make
Bug: 37683421
Change-Id: I0c656b91f3533b87a80c34e7461000e75ee1da8e

7 years agoSurfaceTexture: setConsumerIsProtected
Jiwen 'Steve' Cai [Sat, 22 Apr 2017 02:05:01 +0000 (19:05 -0700)]
SurfaceTexture: setConsumerIsProtected

When in a protected context, SurfaceTexture should call
setConsumerIsProtected Instead of setting consumer usage bits to
indicate the producer that the consumer can handle protected content.

Bug: 35726763
Test: videoplayer-nodrm-protected.apk and videoplayer-drm-protected.apk
both works.

Change-Id: I0028c040e727691e1e42226c0b66de075fe5515d