OSDN Git Service

android-x86/frameworks-base.git
7 years agoMerge "Fix race condition triggered by quick stop/start of Dream" into cw-f-dev am...
Erik Wolsheimer [Tue, 23 May 2017 23:00:03 +0000 (23:00 +0000)]
Merge "Fix race condition triggered by quick stop/start of Dream" into cw-f-dev am: 90a6054805
am: 94b497bccc

Change-Id: I62ab41ed83aa92b12e7fa3c9111a6f97e6ef13ef

7 years agoMerge "Fix race condition triggered by quick stop/start of Dream" into cw-f-dev
Erik Wolsheimer [Tue, 23 May 2017 22:51:25 +0000 (22:51 +0000)]
Merge "Fix race condition triggered by quick stop/start of Dream" into cw-f-dev
am: 90a6054805

Change-Id: I708fda61e866a891238d6dbbfc6a9b901e6da6b3

7 years agoMerge "Respect one-shot click effect config in VibratorService" into oc-dev
TreeHugger Robot [Tue, 23 May 2017 22:46:43 +0000 (22:46 +0000)]
Merge "Respect one-shot click effect config in VibratorService" into oc-dev

7 years agoMerge "Fix race condition triggered by quick stop/start of Dream" into cw-f-dev
TreeHugger Robot [Tue, 23 May 2017 22:44:37 +0000 (22:44 +0000)]
Merge "Fix race condition triggered by quick stop/start of Dream" into cw-f-dev

7 years agoMerge "Fix up upstream interface types for case DUN_UNSPECIFIED" into oc-dev
Jayachandran Chinnakkannu [Tue, 23 May 2017 20:42:41 +0000 (20:42 +0000)]
Merge "Fix up upstream interface types for case DUN_UNSPECIFIED" into oc-dev

7 years agoMerge "Fix starting window leak when adding/removing quickly" into oc-dev
TreeHugger Robot [Tue, 23 May 2017 20:32:26 +0000 (20:32 +0000)]
Merge "Fix starting window leak when adding/removing quickly" into oc-dev

7 years agoMerge "Revert "Disallow starting activities without new task from non-activity contex...
Bryce Lee [Tue, 23 May 2017 19:50:21 +0000 (19:50 +0000)]
Merge "Revert "Disallow starting activities without new task from non-activity context."" into oc-dev

7 years agoRevert "Disallow starting activities without new task from non-activity context."
Bryce Lee [Tue, 23 May 2017 19:46:59 +0000 (19:46 +0000)]
Revert "Disallow starting activities without new task from non-activity context."

This reverts commit 8b49a5c0aa18f70bc59b972e888d5ad455e4d7ca.

Change-Id: I7d2da4ac72ca578942b38fccf8b151f3a2ed081f

7 years agoMerge "Filter package manager calls" into oc-dev
TreeHugger Robot [Tue, 23 May 2017 19:26:11 +0000 (19:26 +0000)]
Merge "Filter package manager calls" into oc-dev

7 years agoMerge "Add new task flag when starting chooser activity in bug report." into oc-dev
Bryce Lee [Tue, 23 May 2017 19:21:07 +0000 (19:21 +0000)]
Merge "Add new task flag when starting chooser activity in bug report." into oc-dev

7 years agoMerge "Fix recent apps in system UI for Skia pipeline" into oc-dev
TreeHugger Robot [Tue, 23 May 2017 19:19:34 +0000 (19:19 +0000)]
Merge "Fix recent apps in system UI for Skia pipeline" into oc-dev

7 years agoMerge "Fixed unminimizing during battery saving mode" into oc-dev
TreeHugger Robot [Tue, 23 May 2017 17:44:04 +0000 (17:44 +0000)]
Merge "Fixed unminimizing during battery saving mode" into oc-dev

7 years agoFix recent apps in system UI for Skia pipeline
Stan Iliev [Mon, 22 May 2017 19:02:25 +0000 (15:02 -0400)]
Fix recent apps in system UI for Skia pipeline

Enable HW Bitmaps for Skia pipelines by using a readback to
convert GraphicBuffer into a raster SkImage. Both BitmapShader
and drawing HW bitmaps into a canvas are supported.

Test: recent apps work, no memory leaks, CTS graphics and
UiRendering tests passed, HWUI unit test passed
bug: 38136140
Change-Id: I23fed5febad3b1009e0417fb7e21a347a8d11b0d
Merged-In: I23fed5febad3b1009e0417fb7e21a347a8d11b0d

7 years agoMerge "Improve time to texture destruction" into oc-dev
John Reck [Tue, 23 May 2017 17:38:36 +0000 (17:38 +0000)]
Merge "Improve time to texture destruction" into oc-dev

7 years agoMerge "batterymeter -> just meter." into oc-dev
Daniel Nishi [Tue, 23 May 2017 17:35:14 +0000 (17:35 +0000)]
Merge "batterymeter -> just meter." into oc-dev

7 years agoMerge "Fix window affecting SysUi visibility for once and all" into oc-dev
TreeHugger Robot [Tue, 23 May 2017 16:58:38 +0000 (16:58 +0000)]
Merge "Fix window affecting SysUi visibility for once and all" into oc-dev

7 years agoMerge "Fix issue with TV PIP clobbering resize on orientation change." into oc-dev
TreeHugger Robot [Tue, 23 May 2017 16:54:44 +0000 (16:54 +0000)]
Merge "Fix issue with TV PIP clobbering resize on orientation change." into oc-dev

7 years agoMerge "Convert Shader to NativeAllocationRegistry" into oc-dev
John Reck [Tue, 23 May 2017 16:43:37 +0000 (16:43 +0000)]
Merge "Convert Shader to NativeAllocationRegistry" into oc-dev

7 years agoMerge "SurfaceView: Wait to gather transparent region." into oc-dev
Rob Carr [Tue, 23 May 2017 16:30:57 +0000 (16:30 +0000)]
Merge "SurfaceView: Wait to gather transparent region." into oc-dev

7 years agoFix starting window leak when adding/removing quickly
Jorim Jaggi [Tue, 23 May 2017 16:00:48 +0000 (18:00 +0200)]
Fix starting window leak when adding/removing quickly

The following race condition may happen when transferring starting
windows:
- Add thread (android.anim) calls Snapshot.create
- Remove thread (android.display!) checks that yes there is a
starting window, but no surface yet. Thus, it nulls out everything.
- Add thread returns from Snapshot.create: container.startingData
is null but startingWindow is also null. Thus, we never set
abort=true and we never set the starting window properly or remove
it properly.

Test: Some basic starting window sanity testing. Otherwise, pray
to the race condition gods.
Test: AppWindowContainerControllerTests#testAddRemoveRace
Fixes: 37888853

Change-Id: Ia287bfa52f708b36ff93ef7cd45a0d080bd4dd9c

7 years agoAdd new task flag when starting chooser activity in bug report.
Bryce Lee [Tue, 23 May 2017 16:02:09 +0000 (09:02 -0700)]
Add new task flag when starting chooser activity in bug report.

This flag is required whenever starting an activity from a
non-activity context.

Change-Id: Ia77e6e7801d712a20d407bc2ac92e543bc287010
Fixes: 62016780
Test: Click on generated bug report notification

7 years agoMerge "Fix FloatingToolbar refresh on menu changes." into oc-dev
TreeHugger Robot [Tue, 23 May 2017 16:01:31 +0000 (16:01 +0000)]
Merge "Fix FloatingToolbar refresh on menu changes." into oc-dev

7 years agoMerge "Ensure FloatingActionMode has a non-null FloatingToolbar." into oc-dev
TreeHugger Robot [Tue, 23 May 2017 15:57:44 +0000 (15:57 +0000)]
Merge "Ensure FloatingActionMode has a non-null FloatingToolbar." into oc-dev

7 years agoUse channel warning development setting.
Geoffrey Pitsch [Thu, 11 May 2017 16:57:22 +0000 (12:57 -0400)]
Use channel warning development setting.

Defaults to enabled for debuggable builds.

Bug: 37945054
Bug: 38380608
Test: manual
Change-Id: I1b67f55d507e31349908953abbf04ac764835915

7 years agoFix window affecting SysUi visibility for once and all
Jorim Jaggi [Tue, 23 May 2017 14:05:35 +0000 (16:05 +0200)]
Fix window affecting SysUi visibility for once and all

This unforunately introduces another quasi-visibiltiy method but
I think this is the best solution, as the code is pretty clean.

Test: Navigate through, settings, make sure no flickering
Test: Launch music from notification
Test: Launch United app
Test: Go settings -> app -> settings repeadetly 100 times, make
sure light bar transition is always clean
Fixes: 38216281

Change-Id: I0b97334dea3bfef2966ad0c7dd8bbd9907f2574c

7 years agoMerge "Ignore a bunch of systemui tests until flakes are found" into oc-dev
Geoffrey Pitsch [Tue, 23 May 2017 14:28:56 +0000 (14:28 +0000)]
Merge "Ignore a bunch of systemui tests until flakes are found" into oc-dev

7 years agoIgnore a bunch of systemui tests until flakes are found
Geoffrey Pitsch [Mon, 22 May 2017 19:20:20 +0000 (15:20 -0400)]
Ignore a bunch of systemui tests until flakes are found

Test: runtest systemui
Bug: 38500852
Change-Id: I54f0e868bd9432758ff21a344631b6888bc83a4b

7 years agoMerge "Reset Keyguard when clicking emergency call button" into oc-dev
Jorim Jaggi [Tue, 23 May 2017 11:04:21 +0000 (11:04 +0000)]
Merge "Reset Keyguard when clicking emergency call button" into oc-dev

7 years agoMerge "Re-run pinner service on camera app update and dex optimization." into oc-dev
TreeHugger Robot [Tue, 23 May 2017 09:24:13 +0000 (09:24 +0000)]
Merge "Re-run pinner service on camera app update and dex optimization." into oc-dev

7 years agoMerge "Check network info for metering state on AccessPoint." into oc-dev
TreeHugger Robot [Tue, 23 May 2017 08:29:45 +0000 (08:29 +0000)]
Merge "Check network info for metering state on AccessPoint." into oc-dev

7 years agoCheck network info for metering state on AccessPoint.
Stephen Chen [Fri, 19 May 2017 22:55:02 +0000 (15:55 -0700)]
Check network info for metering state on AccessPoint.

This resolves bug where networks manually marked as metered by Settings
UI were not tagged with a metered friction icon in the Wi-Fi picker.

Bug: 38460378
Test: runtest --path
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/AccessPointTest.java

Change-Id: I2ffe25e898ac001549e7d7492a2aa335ee415a4e

7 years agoMerge "Revert "Changed alert window notifications to use single channel"" into oc-dev
TreeHugger Robot [Tue, 23 May 2017 03:32:38 +0000 (03:32 +0000)]
Merge "Revert "Changed alert window notifications to use single channel"" into oc-dev

7 years agoSurfaceView: Wait to gather transparent region.
Robert Carr [Mon, 22 May 2017 21:57:48 +0000 (14:57 -0700)]
SurfaceView: Wait to gather transparent region.

With the introduction of surfaceRedrawNeededAsync we may
be asked to gather the transparent region ahead of the SurfaceView
having been drawn.

Bug: 38324871
Test: Launch Chrome Canary a lot! No Flickers.
Change-Id: I35f09a1bb8316895fa704b10c912e64a8920bd90

7 years agoMerge "SurfaceView: Don't destroy Surface while Stopped." into oc-dev
TreeHugger Robot [Tue, 23 May 2017 02:32:13 +0000 (02:32 +0000)]
Merge "SurfaceView: Don't destroy Surface while Stopped." into oc-dev

7 years agoMerge "Restore resetKeyStore() logic of clearing SYSTEM uid" into oc-dev
TreeHugger Robot [Tue, 23 May 2017 01:45:37 +0000 (01:45 +0000)]
Merge "Restore resetKeyStore() logic of clearing SYSTEM uid" into oc-dev

7 years agoRevert "Changed alert window notifications to use single channel"
Wale Ogunwale [Tue, 23 May 2017 01:43:59 +0000 (01:43 +0000)]
Revert "Changed alert window notifications to use single channel"

This reverts commit 8f7bebca3656f4993edef290e62c960f245ff373.

We now want multiple channels so the user can disable which ever ones they like.

Change-Id: I6015cd5f1e3f37a8a01e1db42b57a94087780304
Fixes: 38428796
Bug: 37422870

7 years agoZygoteInit: Remove CAP_SYS_RESOURCE am: 4911af2b8c am: 1cc9ec47c8 am: 8965cd6a39...
Nick Kralevich [Tue, 23 May 2017 01:37:59 +0000 (01:37 +0000)]
ZygoteInit: Remove CAP_SYS_RESOURCE am: 4911af2b8c am: 1cc9ec47c8 am: 8965cd6a39 am: 47beaa8fab am: 55c8a1ede9 am: 66a08a5413 am: 7a06357519 am: a07389b446 am: 5f4382e2a6 am: 3946a75cb3 am: 3c529012d3
am: ce8a0dea71

Change-Id: I9cd7b091b2ce4640a1d7729fb081aef9a3186ab8

7 years agosystem_server: add CAP_SYS_PTRACE am: 966619d0ab am: b8d972e973 am: c46889e2d2 am...
Nick Kralevich [Tue, 23 May 2017 01:36:35 +0000 (01:36 +0000)]
system_server: add CAP_SYS_PTRACE am: 966619d0ab am: b8d972e973 am: c46889e2d2 am: f5bd84b82d am: 982b8018af am: 7fd2d8ea31 am: 5bfe82c3ee am: 12c5f0da9f am: dc87ac995a am: 02f0044d98 am: 6cadbad153
am: fdf1fdfc1b  -s ours

Change-Id: If386c7ba25e1c8d1730e7191abb48ba75971d8af

7 years agoMerge "Bump overlay version number." into oc-dev
TreeHugger Robot [Tue, 23 May 2017 01:20:33 +0000 (01:20 +0000)]
Merge "Bump overlay version number." into oc-dev

7 years agoFix issue with TV PIP clobbering resize on orientation change.
Winson Chung [Tue, 23 May 2017 00:41:06 +0000 (17:41 -0700)]
Fix issue with TV PIP clobbering resize on orientation change.

- When the device rotates due to a test that requests a specific
  orientation, the TV PiP logic was resizing the state back to
  mDefaultPipBounds, which doesn't change depending on orientation change,
  clobbering the bounds in the new orientation that were calculated in WM.
  Since TV does not really care about the rotation case, we can just
  ignore the configuration changes due to orientation changes for the sake
  of passing the common CTS tests across handhelds and TV.

Bug: 38246863
Test: android.server.cts.ActivityManagerPinnedStackTests
Change-Id: Id7988a0b02f14f67908d3202cdd73b186d9fea16

7 years agoZygoteInit: Remove CAP_SYS_RESOURCE am: 4911af2b8c am: 1cc9ec47c8 am: 8965cd6a39...
Nick Kralevich [Tue, 23 May 2017 00:39:49 +0000 (00:39 +0000)]
ZygoteInit: Remove CAP_SYS_RESOURCE am: 4911af2b8c am: 1cc9ec47c8 am: 8965cd6a39 am: 47beaa8fab am: 55c8a1ede9 am: 66a08a5413 am: 7a06357519 am: a07389b446 am: 5f4382e2a6 am: 3946a75cb3
am: 3c529012d3

Change-Id: I9b3ea4577928b601f81525390fa6dae525275323

7 years agosystem_server: add CAP_SYS_PTRACE am: 966619d0ab am: b8d972e973 am: c46889e2d2 am...
Nick Kralevich [Tue, 23 May 2017 00:38:33 +0000 (00:38 +0000)]
system_server: add CAP_SYS_PTRACE am: 966619d0ab am: b8d972e973 am: c46889e2d2 am: f5bd84b82d am: 982b8018af am: 7fd2d8ea31 am: 5bfe82c3ee am: 12c5f0da9f am: dc87ac995a am: 02f0044d98
am: 6cadbad153

Change-Id: I05c01c682c89b4ae42ef9f66a94da611c7378148

7 years agoZygoteInit: Remove CAP_SYS_RESOURCE am: 4911af2b8c am: 1cc9ec47c8 am: 8965cd6a39...
Nick Kralevich [Tue, 23 May 2017 00:25:35 +0000 (00:25 +0000)]
ZygoteInit: Remove CAP_SYS_RESOURCE am: 4911af2b8c am: 1cc9ec47c8 am: 8965cd6a39 am: 47beaa8fab am: 55c8a1ede9 am: 66a08a5413 am: 7a06357519 am: a07389b446 am: 5f4382e2a6
am: 3946a75cb3

Change-Id: I9992c35cfc2b2ad8c4bbff7bf4bf9ca79b6f4568

7 years agoMerge "Blanket deny instant apps from some methods" into oc-dev
TreeHugger Robot [Tue, 23 May 2017 00:24:35 +0000 (00:24 +0000)]
Merge "Blanket deny instant apps from some methods" into oc-dev

7 years agosystem_server: add CAP_SYS_PTRACE am: 966619d0ab am: b8d972e973 am: c46889e2d2 am...
Nick Kralevich [Tue, 23 May 2017 00:24:33 +0000 (00:24 +0000)]
system_server: add CAP_SYS_PTRACE am: 966619d0ab am: b8d972e973 am: c46889e2d2 am: f5bd84b82d am: 982b8018af am: 7fd2d8ea31 am: 5bfe82c3ee am: 12c5f0da9f am: dc87ac995a
am: 02f0044d98

Change-Id: I8fbd6580c4b6c1595b0ff1c34faaec5e1b9ad4de

7 years agoMerge "Align preference text to actionbar title." into oc-dev
TreeHugger Robot [Tue, 23 May 2017 00:22:44 +0000 (00:22 +0000)]
Merge "Align preference text to actionbar title." into oc-dev

7 years agoZygoteInit: Remove CAP_SYS_RESOURCE am: 4911af2b8c am: 1cc9ec47c8 am: 8965cd6a39...
Nick Kralevich [Tue, 23 May 2017 00:18:31 +0000 (00:18 +0000)]
ZygoteInit: Remove CAP_SYS_RESOURCE am: 4911af2b8c am: 1cc9ec47c8 am: 8965cd6a39 am: 47beaa8fab am: 55c8a1ede9 am: 66a08a5413 am: 7a06357519 am: a07389b446
am: 5f4382e2a6

Change-Id: Ieab172a133b0d9198cef008b037c4a1107d0746c

7 years agosystem_server: add CAP_SYS_PTRACE am: 966619d0ab am: b8d972e973 am: c46889e2d2 am...
Nick Kralevich [Tue, 23 May 2017 00:17:22 +0000 (00:17 +0000)]
system_server: add CAP_SYS_PTRACE am: 966619d0ab am: b8d972e973 am: c46889e2d2 am: f5bd84b82d am: 982b8018af am: 7fd2d8ea31 am: 5bfe82c3ee am: 12c5f0da9f
am: dc87ac995a

Change-Id: Ic7e65852a72cde3d2e285774e9cb85e9590e7fd2

7 years agoImprove time to texture destruction
John Reck [Mon, 22 May 2017 22:04:21 +0000 (15:04 -0700)]
Improve time to texture destruction

Eliminate textureCache.mGarbage which is only cleared
in a trimMemory. Instead when we hit ~Bitmap post a
message to RenderThread to release the texture immediately

Bug: 38258699
Test: manual
Change-Id: I962ba275e89afb628ba02f74769287edbab9fed4

7 years agoRe-run pinner service on camera app update and dex optimization.
Carmen Jackson [Tue, 16 May 2017 17:37:26 +0000 (10:37 -0700)]
Re-run pinner service on camera app update and dex optimization.

When the camera app updates or the dex files are optimized, the files
that have been pinned by the pinner service fall out of date. The next
time they're used, they will be paged in like normal. This change
un-pins and re-pins the Camera app when the user's camera app updates,
as well as when background dex optimization finishes.

Bug: 33168521
Test: Manual. Here's a logcat of PinnerService activity while I ran the
following commands:

$ flashall -w
$ adb install -r -d --force-sdk [new camera app].apk
Success
$ adb root
restarting adbd as root
$ adb shell cmd package bg-dexopt-job

SystemServer: PinnerService
SystemServiceManager: Starting com.android.server.PinnerService
PinnerService: Starting PinnerService
SystemServerTiming: PinnerService took to complete: 2ms
PinnerService: Pinned file = /system/framework/arm64/boot-framework.oat
PinnerService: Pinned file = /system/framework/arm64/boot-framework.vdex
PinnerService: Pinned file = /system/framework/oat/arm64/services.odex
PinnerService: Pinned file = /system/framework/oat/arm64/services.vdex
PinnerService: Pinned file = /system/framework/arm64/boot.oat
PinnerService: Pinned file = /system/framework/arm64/boot.vdex
PinnerService: Pinned file =
/system/framework/arm64/boot-core-libart.oat
PinnerService: Pinned file =
/system/framework/arm64/boot-core-libart.vdex
PinnerService: Pinned /system/app/GoogleCamera/GoogleCamera.apk
PinnerService: Pinned
/data/dalvik-cache/arm64/system@app@GoogleCamera@GoogleCamera.apk@classes.dex
PinnerService: Updating pinned files.
PinnerService: Unpinned file /system/app/GoogleCamera/GoogleCamera.apk
PinnerService: Unpinned file
/data/dalvik-cache/arm64/system@app@GoogleCamera@GoogleCamera.apk@classes.dex
PinnerService: Pinned
/data/app/com.google.android.GoogleCamera-vVji3RQcPHS1Lzqh1WjY1g==/base.apk
PinnerService: Pinned
/data/app/com.google.android.GoogleCamera-vVji3RQcPHS1Lzqh1WjY1g==/oat/arm64/base.odex
PinnerService: Updating pinned files.
PinnerService: Unpinned file
/data/app/com.google.android.GoogleCamera-vVji3RQcPHS1Lzqh1WjY1g==/base.apk
PinnerService: Unpinned file
/data/app/com.google.android.GoogleCamera-vVji3RQcPHS1Lzqh1WjY1g==/oat/arm64/base.odex
PinnerService: Pinned
/data/app/com.google.android.GoogleCamera-vVji3RQcPHS1Lzqh1WjY1g==/base.apk
PinnerService: Pinned
/data/app/com.google.android.GoogleCamera-vVji3RQcPHS1Lzqh1WjY1g==/oat/arm64/base.odex

Change-Id: I10d72d6a3d1717773324913362a638f199d49bc9

7 years agoZygoteInit: Remove CAP_SYS_RESOURCE am: 4911af2b8c am: 1cc9ec47c8 am: 8965cd6a39...
Nick Kralevich [Tue, 23 May 2017 00:07:43 +0000 (00:07 +0000)]
ZygoteInit: Remove CAP_SYS_RESOURCE am: 4911af2b8c am: 1cc9ec47c8 am: 8965cd6a39 am: 47beaa8fab am: 55c8a1ede9 am: 66a08a5413 am: 7a06357519
am: a07389b446

Change-Id: I5e8fdff89b3d8d1e36f24767dc60efa1dc352dcb

7 years agosystem_server: add CAP_SYS_PTRACE am: 966619d0ab am: b8d972e973 am: c46889e2d2 am...
Nick Kralevich [Tue, 23 May 2017 00:06:55 +0000 (00:06 +0000)]
system_server: add CAP_SYS_PTRACE am: 966619d0ab am: b8d972e973 am: c46889e2d2 am: f5bd84b82d am: 982b8018af am: 7fd2d8ea31 am: 5bfe82c3ee
am: 12c5f0da9f

Change-Id: I8ce1d6a2399967cf0408adf7ffbe1839f471e1e7

7 years agoMerge "Clearing up invalid entries when SyncStorageEngine starts" into oc-dev
TreeHugger Robot [Tue, 23 May 2017 00:02:13 +0000 (00:02 +0000)]
Merge "Clearing up invalid entries when SyncStorageEngine starts" into oc-dev

7 years agoMerge "Skip ConnOnActivityStartTest and CoreSettingsObserverTest." into oc-dev
Sudheer Shanka [Tue, 23 May 2017 00:01:54 +0000 (00:01 +0000)]
Merge "Skip ConnOnActivityStartTest and CoreSettingsObserverTest." into oc-dev

7 years agoRespect one-shot click effect config in VibratorService
Erik Wolsheimer [Mon, 22 May 2017 23:58:18 +0000 (16:58 -0700)]
Respect one-shot click effect config in VibratorService

Bug: 37248030
Change-Id: Ic0d687639bf9870813276578165132adec445a93

7 years agoMerge "Read cpu freq data only when needed." into oc-dev
Sudheer Shanka [Mon, 22 May 2017 23:51:56 +0000 (23:51 +0000)]
Merge "Read cpu freq data only when needed." into oc-dev

7 years agoZygoteInit: Remove CAP_SYS_RESOURCE am: 4911af2b8c am: 1cc9ec47c8 am: 8965cd6a39...
Nick Kralevich [Mon, 22 May 2017 23:51:48 +0000 (23:51 +0000)]
ZygoteInit: Remove CAP_SYS_RESOURCE am: 4911af2b8c am: 1cc9ec47c8 am: 8965cd6a39 am: 47beaa8fab am: 55c8a1ede9 am: 66a08a5413
am: 7a06357519

Change-Id: I9301189268f519d4b87d8c9bfa88d1da4e8a53cd

7 years agosystem_server: add CAP_SYS_PTRACE am: 966619d0ab am: b8d972e973 am: c46889e2d2 am...
Nick Kralevich [Mon, 22 May 2017 23:50:57 +0000 (23:50 +0000)]
system_server: add CAP_SYS_PTRACE am: 966619d0ab am: b8d972e973 am: c46889e2d2 am: f5bd84b82d am: 982b8018af am: 7fd2d8ea31
am: 5bfe82c3ee

Change-Id: I95333a7ff3d6ee1a3161d436a2a0b312931b663e

7 years agoMerge "Fixes landscape minimized bounds for launcher hiding widget control" into...
TreeHugger Robot [Mon, 22 May 2017 23:50:06 +0000 (23:50 +0000)]
Merge "Fixes landscape minimized bounds for launcher hiding widget control" into oc-dev

7 years agoZygoteInit: Remove CAP_SYS_RESOURCE am: 4911af2b8c am: 1cc9ec47c8 am: 8965cd6a39...
Nick Kralevich [Mon, 22 May 2017 23:36:12 +0000 (23:36 +0000)]
ZygoteInit: Remove CAP_SYS_RESOURCE am: 4911af2b8c am: 1cc9ec47c8 am: 8965cd6a39 am: 47beaa8fab am: 55c8a1ede9
am: 66a08a5413

Change-Id: Ica5cb7828a37bd597dc0d83f7a65e89380d1e31c

7 years agosystem_server: add CAP_SYS_PTRACE am: 966619d0ab am: b8d972e973 am: c46889e2d2 am...
Nick Kralevich [Mon, 22 May 2017 23:35:04 +0000 (23:35 +0000)]
system_server: add CAP_SYS_PTRACE am: 966619d0ab am: b8d972e973 am: c46889e2d2 am: f5bd84b82d am: 982b8018af
am: 7fd2d8ea31

Change-Id: I4b57d119b9b8d512a017ede0fb62658fb25f9580

7 years agoMerge "Properly defer entrance animations until after the stack is reloaded." into...
Winson Chung [Mon, 22 May 2017 23:20:09 +0000 (23:20 +0000)]
Merge "Properly defer entrance animations until after the stack is reloaded." into oc-dev

7 years agoZygoteInit: Remove CAP_SYS_RESOURCE am: 4911af2b8c am: 1cc9ec47c8 am: 8965cd6a39...
Nick Kralevich [Mon, 22 May 2017 23:19:09 +0000 (23:19 +0000)]
ZygoteInit: Remove CAP_SYS_RESOURCE am: 4911af2b8c am: 1cc9ec47c8 am: 8965cd6a39 am: 47beaa8fab
am: 55c8a1ede9

Change-Id: Ia3e4d749c5b5475640325fd47eb4260d52e61365

7 years agosystem_server: add CAP_SYS_PTRACE am: 966619d0ab am: b8d972e973 am: c46889e2d2 am...
Nick Kralevich [Mon, 22 May 2017 23:18:24 +0000 (23:18 +0000)]
system_server: add CAP_SYS_PTRACE am: 966619d0ab am: b8d972e973 am: c46889e2d2 am: f5bd84b82d
am: 982b8018af

Change-Id: I8cb5052694668ee8021f75778244e4d1b6cc3bb5

7 years agoMerge "Revert "Upgrade logging for UsbDeviceManager to narrow down bugs."" into oc-dev
Jerry Zhang [Mon, 22 May 2017 23:13:53 +0000 (23:13 +0000)]
Merge "Revert "Upgrade logging for UsbDeviceManager to narrow down bugs."" into oc-dev

7 years agoZygoteInit: Remove CAP_SYS_RESOURCE am: 4911af2b8c am: 1cc9ec47c8 am: 8965cd6a39
Nick Kralevich [Mon, 22 May 2017 23:02:54 +0000 (23:02 +0000)]
ZygoteInit: Remove CAP_SYS_RESOURCE am: 4911af2b8c am: 1cc9ec47c8 am: 8965cd6a39
am: 47beaa8fab

Change-Id: Ie697e5e8bfb7664b410d564a84ae5784be890f90

7 years agosystem_server: add CAP_SYS_PTRACE am: 966619d0ab am: b8d972e973 am: c46889e2d2
Nick Kralevich [Mon, 22 May 2017 23:02:13 +0000 (23:02 +0000)]
system_server: add CAP_SYS_PTRACE am: 966619d0ab am: b8d972e973 am: c46889e2d2
am: f5bd84b82d

Change-Id: I163a9224d6b0ff5f42f52656773e1c297661b977

7 years agoFix FloatingToolbar refresh on menu changes.
Abodunrinwa Toki [Mon, 22 May 2017 14:20:18 +0000 (15:20 +0100)]
Fix FloatingToolbar refresh on menu changes.

 Also includes some minor code clean ups.

Fixes: 38465735
Test: bit FrameworksCoreTests:android.widget.TextViewActivityTest
bit CtsWidgetTestCases:android.widget.cts.TextViewTest

Change-Id: Ie87cc256b77b3ec5732f49c000ce4845130fc91c

7 years agoMerge "Fix Companion UI crash on configuration change" into oc-dev
Eugene Susla [Mon, 22 May 2017 22:54:34 +0000 (22:54 +0000)]
Merge "Fix Companion UI crash on configuration change" into oc-dev

7 years agoZygoteInit: Remove CAP_SYS_RESOURCE am: 4911af2b8c am: 1cc9ec47c8
Nick Kralevich [Mon, 22 May 2017 22:46:18 +0000 (22:46 +0000)]
ZygoteInit: Remove CAP_SYS_RESOURCE am: 4911af2b8c am: 1cc9ec47c8
am: 8965cd6a39

Change-Id: If549cda5fd1a640fee746311745b9b08ebf63b91

7 years agosystem_server: add CAP_SYS_PTRACE am: 966619d0ab am: b8d972e973
Nick Kralevich [Mon, 22 May 2017 22:45:44 +0000 (22:45 +0000)]
system_server: add CAP_SYS_PTRACE am: 966619d0ab am: b8d972e973
am: c46889e2d2

Change-Id: I840740012d9ba0c434f7de0fd9ca83a44926d018

7 years agoMerge "Do not relayout on default focus highlight." into oc-dev
Jiaquan He [Mon, 22 May 2017 22:25:09 +0000 (22:25 +0000)]
Merge "Do not relayout on default focus highlight." into oc-dev

7 years agoZygoteInit: Remove CAP_SYS_RESOURCE am: 4911af2b8c
Nick Kralevich [Mon, 22 May 2017 22:24:39 +0000 (22:24 +0000)]
ZygoteInit: Remove CAP_SYS_RESOURCE am: 4911af2b8c
am: 1cc9ec47c8

Change-Id: Ic81685686dabbc1f0004a30785a021bf89420846

7 years agosystem_server: add CAP_SYS_PTRACE am: 966619d0ab
Nick Kralevich [Mon, 22 May 2017 22:23:47 +0000 (22:23 +0000)]
system_server: add CAP_SYS_PTRACE am: 966619d0ab
am: b8d972e973

Change-Id: I4d9e2d9b53523b9182a9f9272d06a93a87b0c61b

7 years agoMerge "Attempt to fix broken/flaky FadeTransitionTest" into oc-dev
TreeHugger Robot [Mon, 22 May 2017 22:07:11 +0000 (22:07 +0000)]
Merge "Attempt to fix broken/flaky FadeTransitionTest" into oc-dev

7 years agoMerge "Remove all activities that do not successfully launch." into oc-dev
TreeHugger Robot [Mon, 22 May 2017 22:05:54 +0000 (22:05 +0000)]
Merge "Remove all activities that do not successfully launch." into oc-dev

7 years agoZygoteInit: Remove CAP_SYS_RESOURCE
Nick Kralevich [Mon, 22 May 2017 22:05:18 +0000 (22:05 +0000)]
ZygoteInit: Remove CAP_SYS_RESOURCE
am: 4911af2b8c

Change-Id: I4aa46981edb8fd711e1aec8c889528e596e5c233

7 years agosystem_server: add CAP_SYS_PTRACE
Nick Kralevich [Mon, 22 May 2017 22:04:57 +0000 (22:04 +0000)]
system_server: add CAP_SYS_PTRACE
am: 966619d0ab

Change-Id: Ie5f95f2c078cd0bec7a2b2321c3303301ec9ec74

7 years agoMerge "Re-add default channel on app targetsdk downgrade." into oc-dev
TreeHugger Robot [Mon, 22 May 2017 22:03:00 +0000 (22:03 +0000)]
Merge "Re-add default channel on app targetsdk downgrade." into oc-dev

7 years agoMerge "Turn on generic multi-window and multi-display in order to support Activity...
TreeHugger Robot [Mon, 22 May 2017 21:24:24 +0000 (21:24 +0000)]
Merge "Turn on generic multi-window and multi-display in order to support Activity in virtual display" into oc-dev

7 years agoFilter package manager calls
Todd Kennedy [Mon, 22 May 2017 21:13:02 +0000 (14:13 -0700)]
Filter package manager calls

These are some of the nuanced package manager calls. These aren't
outright allowed or denied. Instead, their return value depends upon
who's calling it [eg an instant app or a full app] and the type of
application the method operates on.

Bug: 35871369
Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.EphemeralTest
Test: Manual; install instant app and ensure it runs
Change-Id: I88b37e2c7928d5b0a7428cef53112dc193053266

7 years agoMerge "Do not unminimize after rotate when minimized getting wrong transition" into...
Matthew Ng [Mon, 22 May 2017 20:47:06 +0000 (20:47 +0000)]
Merge "Do not unminimize after rotate when minimized getting wrong transition" into oc-dev

7 years agoConvert Shader to NativeAllocationRegistry
John Reck [Fri, 19 May 2017 17:55:20 +0000 (10:55 -0700)]
Convert Shader to NativeAllocationRegistry

Bug: 38258699
Test: manual
Change-Id: I1537dee3187ea0366f2c236f3e6825196d738a37

7 years agoDo not relayout on default focus highlight.
Jiaquan He [Thu, 11 May 2017 18:56:43 +0000 (11:56 -0700)]
Do not relayout on default focus highlight.

Test: AdjacentListsWithAdjacentISVsInsideTest.testFocusedRectAndFocusHintWorkWithinListItemHorizontal
Bug: 38195445

Change-Id: I4ba61d1dd6b806bff5305986a086c436c3b05b12

7 years agoFixes landscape minimized bounds for launcher hiding widget control
Matthew Ng [Wed, 17 May 2017 22:03:18 +0000 (15:03 -0700)]
Fixes landscape minimized bounds for launcher hiding widget control

Adds the statusbar height to the left bound of the launcher when in
minimized mode forgotten when added to the docked app in ag/2126615.
That bug requested to add the statusbar height to the docked stack
making it larger.

Test: manual, go into minimized state, drag a widget from launcher
Change-Id: I11e6f5b9154bc7ade026f230849adc2c722a9626
Fixes: 38301371

7 years agoMerge "Fix issue #38393543: Not allowed to start service Intent" into oc-dev
Dianne Hackborn [Mon, 22 May 2017 20:03:29 +0000 (20:03 +0000)]
Merge "Fix issue #38393543: Not allowed to start service Intent" into oc-dev

7 years agoRe-add default channel on app targetsdk downgrade.
Julia Reynolds [Mon, 22 May 2017 19:47:06 +0000 (15:47 -0400)]
Re-add default channel on app targetsdk downgrade.

Test: runtest systemui-notification, and manual: adb install the
apk pulled off dogfood device, verify that sending an email
results in a toast pre change and no toast + notification
post change.
Change-Id: Ia3db55959906f38a5dc34cb38a33072c1f2dd64f
Fixes: 38437227

7 years agoBump overlay version number.
Andrew Sapperstein [Mon, 22 May 2017 19:46:51 +0000 (12:46 -0700)]
Bump overlay version number.

Forces the overlays.xml file to be ignored and overwritten,
which makes the default overlay be used in all cases, rather
than no overlay.

Fixes: 37788042
Test: manual, removed some overlays in an update and observed that
the proper overlay was used.

Change-Id: Ieda4485f3e64ae627476e1fdcfc5af6cdcca0c15

7 years agoBlanket deny instant apps from some methods
Todd Kennedy [Thu, 18 May 2017 23:31:33 +0000 (16:31 -0700)]
Blanket deny instant apps from some methods

There are many methods instant apps are not allowed to call. Throw
a SecurityException if they try to call them.

Bug: 35871369
Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.EphemeralTest
Test: Manual; install instant app and ensure it runs
Change-Id: Iffdc6cd4e298fc4e1070e68abf7065369d0bed25

7 years agoZygoteInit: Remove CAP_SYS_RESOURCE
Nick Kralevich [Tue, 14 Mar 2017 17:25:35 +0000 (10:25 -0700)]
ZygoteInit: Remove CAP_SYS_RESOURCE

Please see commit 3082eb7c7253c62a06aa151a80487a4eabd49914 for an
explanation of this change.

This capability is not used by system_server.

Bug: 34951864
Bug: 38496951
Test: code compiles, device boots, no selinux errors ever reported.
Change-Id: I4242b1abaa8679b9bfa0d31a1df565b46b7b3cc3
(cherry picked from commit 35775783fc6609035136184e3843bc743b59945d)

7 years agoMerge "Fix AppOps exception for notification channel toasts" into oc-dev
TreeHugger Robot [Mon, 22 May 2017 19:10:06 +0000 (19:10 +0000)]
Merge "Fix AppOps exception for notification channel toasts" into oc-dev

7 years agosystem_server: add CAP_SYS_PTRACE
Nick Kralevich [Wed, 15 Feb 2017 23:12:31 +0000 (15:12 -0800)]
system_server: add CAP_SYS_PTRACE

Commit https://android.googlesource.com/kernel/common/+/f0ce0eee added
CAP_SYS_RESOURCE as a capability check which would allow access to
sensitive /proc/PID files. system_server uses this capability to collect
smaps from managed processes. Presumably this was done to avoid the
implications of granting CAP_SYS_PTRACE to system_server.

However, with SELinux enforcement, we can grant CAP_SYS_PTRACE but not
allow ptrace attach() to other processes. The net result of this is that
CAP_SYS_PTRACE and CAP_SYS_RESOURCE have identical security controls, as
long as system_server:process ptrace is never granted.

Add CAP_SYS_PTRACE to the set of capabilities granted to system_server.

Don't delete CAP_SYS_RESOURCE for now. SELinux has blocked the use of
CAP_SYS_RESOURCE, but we still want to generate audit logs if it's
triggered. CAP_SYS_RESOURCE can be deleted in a future commit.

Bug: 34951864
Bug: 38496951
Test: Device boots, functionality remains identical, no sys_resource
denials from system_server.
Change-Id: I2570266165396dba2b600eac7c42c94800d9c65b
(cherry picked from commit 3082eb7c7253c62a06aa151a80487a4eabd49914)

7 years agoMerge "Wait on activity brought to front for trampoline activities." into oc-dev
TreeHugger Robot [Mon, 22 May 2017 18:02:16 +0000 (18:02 +0000)]
Merge "Wait on activity brought to front for trampoline activities." into oc-dev

7 years agoRevert "Upgrade logging for UsbDeviceManager to narrow down bugs."
Jerry Zhang [Thu, 4 May 2017 23:30:12 +0000 (16:30 -0700)]
Revert "Upgrade logging for UsbDeviceManager to narrow down bugs."

This reverts commit c889b4f4eb62ae7ad8de3ff3d98768e71cb3ad5a.

Merged-In: I74306bacad2a61471a9b8c9fd881229b22b6975e
Change-Id: I74306bacad2a61471a9b8c9fd881229b22b6975e

7 years agoAlign preference text to actionbar title.
Fan Zhang [Mon, 22 May 2017 16:51:43 +0000 (09:51 -0700)]
Align preference text to actionbar title.

Change-Id: I6efd07c5b8bcbbb86c92e2b6e708342fd52e1857
Fix: 38471026
Test: visual

7 years agoMerge "WifiManager: get startLOHS packageName" into oc-dev
Rebecca Silberstein [Mon, 22 May 2017 16:57:52 +0000 (16:57 +0000)]
Merge "WifiManager: get startLOHS packageName" into oc-dev

7 years agoAttempt to fix broken/flaky FadeTransitionTest
George Mount [Tue, 16 May 2017 22:12:06 +0000 (15:12 -0700)]
Attempt to fix broken/flaky FadeTransitionTest

Bug 38349552

This is a blind fix for the test, but it should reduce flakiness
by removing the use of Thread.sleep().

Test: ran FadeTransitionTest
Change-Id: I3156c354b370c34885dfbfd7ecd1b5908a9dab44

7 years agoMerge "Fix bad merge causing Recents to be started twice in succession." into oc-dev
Winson Chung [Mon, 22 May 2017 16:11:24 +0000 (16:11 +0000)]
Merge "Fix bad merge causing Recents to be started twice in succession." into oc-dev

7 years agoFix AppOps exception for notification channel toasts
Geoffrey Pitsch [Mon, 22 May 2017 14:53:44 +0000 (10:53 -0400)]
Fix AppOps exception for notification channel toasts

Check isSystemToast before noteNotifcationOp

Test: manual
Change-Id: Ie65b57365389b083a14c030642d79e98f686c303
Fixes: 38474090

7 years agoMerge "Disallow starting activities without new task from non-activity context."...
Bryce Lee [Mon, 22 May 2017 14:30:59 +0000 (14:30 +0000)]
Merge "Disallow starting activities without new task from non-activity context." into oc-dev