OSDN Git Service
Chih-Wei Huang [Thu, 4 Jan 2018 08:31:43 +0000 (16:31 +0800)]
Merge tag 'android-7.1.2_r36' into nougat-x86
Android 7.1.2 Release 36 (N2G48H)
Chih-Wei Huang [Tue, 21 Nov 2017 08:36:30 +0000 (16:36 +0800)]
input: simulate long press properly
The original implementation of long press sends two ACTION_DOWN events
which would be interpreted as a double tap. For example, sending
a long press POWER key will launch the camera:
11-21 16:27:37.320 2223 2223 I Input : injectKeyEvent: KeyEvent { action=ACTION_DOWN, keyCode=KEYCODE_POWER, scanCode=0, metaState=0, flags=0x0, repeatCount=0, eventTime=39641, downTime=39641, deviceId=-1, source=0x101 }
11-21 16:27:37.321 2223 2223 I Input : injectKeyEvent: KeyEvent { action=ACTION_DOWN, keyCode=KEYCODE_POWER, scanCode=0, metaState=0, flags=0x80, repeatCount=1, eventTime=39641, downTime=39641, deviceId=-1, source=0x101 }
11-21 16:27:37.322 1411 1565 I GestureLauncherService: Power button double tap gesture detected, launching camera. Interval=0ms
11-21 16:27:37.322 2223 2223 I Input : injectKeyEvent: KeyEvent { action=ACTION_UP, keyCode=KEYCODE_POWER, scanCode=0, metaState=0, flags=0x0, repeatCount=0, eventTime=39641, downTime=39641, deviceId=-1, source=0x101 }
This is unexpected and incorrect.
Just simulate the long press by delaying ACTION_UP one second.
Chih-Wei Huang [Fri, 17 Nov 2017 09:13:45 +0000 (17:13 +0800)]
Add a shebang to the script
Without the shebang the init can't exec it.
android-build-team Robot [Fri, 3 Nov 2017 19:55:11 +0000 (19:55 +0000)]
Merge cherrypicks of [
3166006,
3165952,
3164925,
3164926,
3164927,
3164928,
3167313,
3167314,
3167315,
3167316,
3167317,
3167318,
3167319,
3167320,
3167321,
3167322,
3166318,
3166319,
3166320,
3166321,
3166322,
3166323,
3166324,
3167333,
3167334,
3167373,
3165112,
3166325,
3165229,
3165230] into nyc-mr2-release
Change-Id: I546b4167d7871ddcbec026be06cd4d1a456a65d6
Jeff Sharkey [Mon, 12 Jun 2017 23:33:07 +0000 (17:33 -0600)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions.
KEY_INTENT has no business granting any Uri permissions, so remove
any grant flags that malicious apps may have tried sneaking in.
Test: builds, boots
Bug:
32990341,
32879915
Change-Id: I657455a770c81f045ccce6abbd2291407a1cfb42
(cherry picked from commit
ec733747bb428cea3b5523518c59159031f96e47)
Leon Scroggins III [Fri, 10 Mar 2017 15:50:33 +0000 (10:50 -0500)]
Stop explicitly using kCallerPasses_Ownership
Bug:
65646012
Bug:
65426286
Cherry-picked from master. The original CL just updates BitmapFactory.
This also updates ExifInterface in the same way. ExifInterface.cpp no
longer existed by the time the Skia change landed.
Required for Ib7aaf367f68f8764147887d858f65ee14fa7a1d9, which fixes
the aforementioned bugs.
Test: No change in behavior, no new tests.
This enum is going away in https://skia-review.googlesource.com/c/9498,
and this method is using the default anyway.
Merged-In: I928a72851f90e84f45ce2fa49560f8ba894a8058
Merged-In: I8f6c761e50cb29476dc0784f58908ec35e3c70e9
Change-Id: I928a72851f90e84f45ce2fa49560f8ba894a8058
(cherry picked from commit
adb5e0ba6d532c0d52b3bf89a1dbec4e3e7a6fd6)
Chih-Wei Huang [Fri, 27 Oct 2017 09:58:58 +0000 (17:58 +0800)]
Revert "Fix black background for android-x86"
This is unnecessary now since SwiftShader doesn't have the black
background issue.
This reverts commit
da9a2891f8b2f6bb01d60f0811644b965bbff4d5.
Ladehunter [Mon, 18 Sep 2017 03:07:43 +0000 (03:07 +0000)]
Fix bug of ForceOrientation
Signed-off-by: Ladehunter <ladehunter@gmail.com>
android-build-team Robot [Fri, 6 Oct 2017 18:29:49 +0000 (18:29 +0000)]
Merge cherrypicks of [
3026768,
3026929,
3026930,
3026931,
3026932,
3026933,
3026934,
3026935,
3026936,
3026937,
3026938,
3026939,
3026734] into nyc-mr2-release
Change-Id: I2059608bfea23e1f8b2e3de4a19e1884d9fde8f2
Siyamed Sinir [Wed, 13 Sep 2017 23:32:21 +0000 (16:32 -0700)]
Fix ClipboardService device lock check for cross profile
ClipboardService.isDeviceLocked should clear callingIdentity before
accessing KeyguardManager.
Test: bit CtsDevicePolicyManagerTestCases:com.android.cts.devicepolicy.ManagedProfileTest
Bug:
64934810
Change-Id: I81a7adac8c9d56ed801ffc1380fcbc987d5df3e6
Merged-In: I712abfe8d542cd1be9c1816f407c8912321ac480
(cherry picked from commit
6d79675e0c0e55a7d5591a123727796f52c42954)
android-build-team Robot [Thu, 28 Sep 2017 17:16:10 +0000 (17:16 +0000)]
Merge cherrypicks of [
2973982,
2974657,
2974658,
2973983,
2973984,
2974689,
2974690,
2974691,
2974692,
2974710,
2974711,
2974713,
2974714,
2974215,
2974216,
2974217,
2974218,
2974219,
2974220,
2974729,
2974730,
2974731,
2974732,
2974733,
2974734,
2974735,
2974736,
2974737,
2974738,
2974739,
2974740,
2974741,
2974742,
2974749,
2974750,
2974751,
2974752,
2974753,
2974647,
2974744,
2974693,
2974694,
2974648,
2974513,
2974665,
2974746] into nyc-mr2-release
Change-Id: Iba445710659313fab4ac001284a3b5eff3566540
Siyamed Sinir [Thu, 7 Sep 2017 01:02:23 +0000 (18:02 -0700)]
Prevent getting data from Clipboard if device is locked
Clipboard should not return data if the device is locked. This CL checks
for device locked state before returning values from get/has functions.
Bug:
64934810
Change-Id: I856a9079fe64db0af44383fae1a9a418de959420
Merged-In: Icefac226615fe22a7735dff4ba4c3b528fb2ac12
(cherry picked from commit
0b8fa2f5e0d305f083345968a7c39fe7a6f0a158)
Suprabh Shukla [Fri, 12 May 2017 22:26:54 +0000 (15:26 -0700)]
Clearing up invalid entries when SyncStorageEngine starts
Any app with permission WRITE_SYNC_SETTINGS could write sync settings
for authorities or accounts that are not valid. This results in invalid
data being persisted to disk which can effectively lead to a DOS style
attack. Clearing such entries on boot will make sure that a reboot fixes
any such issues.
Test: cts-tradefed run cts-dev -m CtsSyncContentHostTestCases
Bug:
35028827
Change-Id: I9e206a42508e3cba65d7523bf47fff743f47dcb2
Merged-In: I9e206a42508e3cba65d7523bf47fff743f47dcb2
(cherry picked from commit
042a478b73c3b7f7cd73f5bb1af657cfe07d0571)
(cherry picked from commit
e5787fc13164856e39690e40e81d3d46839eea16)
Tony Mak [Fri, 28 Jul 2017 10:53:56 +0000 (11:53 +0100)]
Enforce policy for camera gesture in keyguard
Test:
1. Set lock screen, set keyguard policy. Lock the device.
Observe that double tap is not showing camera
2. Set lock screen, unset the keyguard policy. Lock the device.
Observe that double tap is showing camera
3. Unset lock screen (swipe), set the keyguard policy. Lock the device.
Observe that double tap is showing camera.
4. Unset lock screen (swipe), unset the keyguard policy. Lock the device.
Observe that double tap is showing camera.
Bug:
63787722
Merged-In: I104688eaad719528376e2851f837d5956a6a1169
Change-Id: I42e6d9015682998176fe41971356bde22e1b37b2
(cherry picked from commit
5b064e03bd28c734a6f6022e2cbdff14410dc59a)
Charles He [Fri, 14 Jul 2017 13:41:06 +0000 (14:41 +0100)]
Fix security hole in GateKeeperResponse.
GateKeeperResponse has inconsistent writeToParcel() and
createFromParcel() methods, making it possible for a malicious app to
create a Bundle that changes contents after reserialization. Such
Bundles can be used to execute Intents with system privileges.
This CL changes writeToParcel() to make serialization and
deserialization consistent, thus fixing the issue.
Bug:
62998805
Test: use the debug app (see bug)
Change-Id: Ie1c64172c454c3a4b7a0919eb3454f0e38efcd09
(cherry picked from commit
e74cae8f7c3e6b12f2bf2b75427ee8f5b53eca3c)
Tony Mak [Tue, 15 Aug 2017 18:56:39 +0000 (19:56 +0100)]
DPC should not be allowed to grant development permission
Test: cts-tradefed run cts-dev --module CtsDevicePolicyManagerTestCases --t com.android.cts.devicepolicy.MixedDeviceOwnerTest#testPermissionGrant_developmentPermission
Test: cts-tradefed run cts-dev --module CtsDevicePolicyManagerTestCases --t com.android.cts.devicepolicy.MixedProfileOwnerTest#testPermissionGrant_developmentPermission
Test: cts-tradefed run cts-dev --module CtsDevicePolicyManagerTestCases --t com.android.cts.devicepolicy.MixedDeviceOwnerTest#testPermissionGrant
Test: cts-tradefed run cts-dev --module CtsDevicePolicyManagerTestCases --t com.android.cts.devicepolicy.MixedProfileOwnerTest#testPermissionGrant
Test: Run "Permissions lockdown" test in CtsVerifier
Merged-In: If83d8edd0eea99145421e967ae47fdc264a5cf7c
Merged-In: I129bfe850981cf0b3646b7c1cf19c8a3ec69f512
Bug:
62623498
Change-Id: Ief96a23fa49f1ea923574840f8ff590a5ea2456e
(cherry picked from commit
bd0dcada2a545760033cb638b397d2dc51cca5f2)
Chih-Wei Huang [Thu, 14 Sep 2017 10:28:21 +0000 (18:28 +0800)]
Revert "disables hardware acceleration if debug.egl.hw=0"
This reverts commit
96a3531bbab7d948f2c0b454e51691897f659ea5.
Chih-Wei Huang [Mon, 21 Aug 2017 07:44:43 +0000 (15:44 +0800)]
WindowState: fix touchableRegion for full screen apps
When ForceDefaultOrientation is enabled, the rough one-third left side
of a portrait app is untouchable. That's because the touchableRegion
is set to mBounds of TaskStack. From dumpsys window displays we see
the mBounds is set to absolute coordinate like
WINDOW MANAGER DISPLAY CONTENTS (dumpsys window displays)
Display: mDisplayId=0
init=1024x768 160dpi cur=590x768 app=590x720 rng=590x518-768x696
deferred=false layoutNeeded=false
Application tokens in top down Z order:
mStackId=1
mDeferDetach=false
mFullscreen=true
mBounds=[217,0][807,768]
...
However, Inputflinger calculates the coordinate (x, y) of MotionEntry
in relative value. As a result, events with x < 217 are dropped.
To fix it, don't set touchableRegion to mBounds for full screen apps
as the line 1710 comment of WindowState.java said.
Bug: https://issuetracker.google.com/issues/
64817647
Chih-Wei Huang [Fri, 18 Aug 2017 04:06:18 +0000 (12:06 +0800)]
DisplayManagerService: fix brightness control function
The commit
9f7f27a5 doesn't only disables display blanking on suspend
but also disables brightness control accidentally.
I didn't notice the applyGlobalDisplayStateLocked() function also
controls brightness. Now only disable it on real display blanking.
Fix:
9f7f27a5 (DisplayManagerService: disable display blanking on suspend)
Chih-Wei Huang [Fri, 11 Aug 2017 05:28:11 +0000 (13:28 +0800)]
Merge tag 'android-7.1.2_r33' into nougat-x86
Android 7.1.2 Release 33 (NZH54D)
Chih-Wei Huang [Tue, 1 Aug 2017 09:10:43 +0000 (17:10 +0800)]
DisplayManagerService: disable display blanking on suspend
A workaround for black screen that SurfaceFlinger never recovers from.
The kernel does this anyway.
Re-worked from the original kitkat-x86 patch of Kyle Evans.
android-build-team Robot [Thu, 27 Jul 2017 00:29:26 +0000 (00:29 +0000)]
Merge cherrypicks of [
2607234,
2607235,
2606313,
2607236,
2607238,
2607239,
2606314,
2606315,
2607240,
2606316,
2606317,
2607241,
2607242,
2607243,
2607244,
2607370,
2607371,
2607245,
2607246,
2607247,
2607248,
2607249,
2607372,
2607390,
2607391,
2607392,
2607393,
2607373,
2607394,
2607397,
2607398,
2607375,
2607401,
2607376,
2607402,
2607377,
2607403,
2607404,
2607378,
2607405,
2607379,
2607380,
2607381,
2607406,
2607382,
2607407,
2607408,
2607409] into nyc-mr2-release
Change-Id: I2cb0467a78702771db0356ba95c847bb6418da1c
Phil Weaver [Wed, 12 Jul 2017 21:04:16 +0000 (14:04 -0700)]
Back-port fixes for b/
62196835
Bug:
62196835
Test: Created an accessibility service that displays a system
and a toast overlay, confirmed that it disappeared when we
reached the accessibility permission screen that uses this
flag.
Change-Id: Ic51ead670fc480e549512ba1d02f49d9c13bc3f0
(cherry picked from commit
41ff5389daa6e6ce4aa853bfae96e5ced0b1d8df)
Chih-Wei Huang [Tue, 18 Jul 2017 05:51:04 +0000 (13:51 +0800)]
Merge tag 'android-7.1.2_r27' into nougat-x86
Android 7.1.2 release 27
Chih-Wei Huang [Wed, 21 Jun 2017 07:49:39 +0000 (15:49 +0800)]
Fix MoveTaskButton function
The MoveTaskButton can't work in Android 7.1.2. Not sure why.
It worked before.
Set the destinationStack explicitly to fix it.
android-build-team Robot [Fri, 16 Jun 2017 17:22:17 +0000 (17:22 +0000)]
Merge cherrypicks of [
2419615,
2419671,
2419656,
2419633,
2419709,
2419634,
2419635,
2419617,
2419618,
2419619,
2419658,
2419697,
2419659,
2419673,
2419726,
2419747,
2419596,
2419748,
2419597,
2419636,
2419711,
2419749,
2419660,
2419713,
2419714,
2419727,
2419674,
2419782,
2419752,
2419731,
2419732,
2419677,
2419717,
2419734,
2419784] into nyc-mr2-security-c-release
Change-Id: Ia85af8ec1aec0294e704e520a8e6b0be7f845228
Marco Nelissen [Fri, 2 Jun 2017 19:16:44 +0000 (12:16 -0700)]
Close connection before retrying
Otherwise the (CTS) server might run out of connections.
Bug:
38391487
Bug:
22771132
Test: build, run CTS, stream music
Change-Id: I92c782a6799ab36eec8df3f7c3217bea667b838a
(cherry picked from commit
46132afee7783665ae12538edd024770dbd93ecb)
android-build-team Robot [Thu, 15 Jun 2017 19:15:47 +0000 (19:15 +0000)]
Merge cherrypicks of [
2413468,
2413357,
2413489,
2413431,
2413506,
2413398,
2413399,
2413319,
2413507,
2413508,
2413371,
2413410,
2413432,
2413358,
2413490,
2413359,
2413360,
2413320,
2413509,
2413491,
2414061,
2413372,
2413492,
2413433,
2413469,
2413411,
2414062,
2413373,
2413374,
2413470,
2413400,
2414063,
2414064,
2413447,
2413434,
2414101,
2413412] into nyc-mr2-release
Change-Id: I7c3d4ab6cac4cc3f95bec81ce08956f0689364fa
Marco Nelissen [Fri, 2 Jun 2017 19:16:44 +0000 (12:16 -0700)]
Close connection before retrying
Otherwise the (CTS) server might run out of connections.
Bug:
38391487
Bug:
22771132
Test: build, run CTS, stream music
Change-Id: I92c782a6799ab36eec8df3f7c3217bea667b838a
(cherry picked from commit
46132afee7783665ae12538edd024770dbd93ecb)
Chih-Wei Huang [Wed, 7 Jun 2017 03:08:47 +0000 (11:08 +0800)]
Merge tag 'android-7.1.2_r17' into nougat-x86
Android 7.1.2 Release 17 (NJH47B)
android-build-team Robot [Wed, 24 May 2017 22:53:55 +0000 (22:53 +0000)]
Merge cherrypicks of [
2310999,
2310925,
2310891,
2311000,
2310892,
2310858,
2310986,
2310963,
2311043,
2310928,
2311044,
2310990,
2311022,
2311023,
2310917,
2310994,
2311024,
2311045,
2310967,
2310995,
2311003,
2311059,
2311025,
2311060,
2310953,
2311061,
2311004,
2311046,
2311005,
2311047,
2311006,
2311079,
2310954,
2311026,
2310896,
2310898,
2310997,
2311062,
2310955,
2311029,
2310998,
2311080,
2311119,
2311030,
2310933,
2311140,
2311063,
2310934,
2311049,
2311050,
2311084,
2311031,
2311145,
2311164] into nyc-mr2-security-c-release
Change-Id: Iaca90436dbd44ed8bd2629340441480ea362844c
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)
(cherry picked from commit
4911af2b8ced29dc5035dca301dc80939c9bdab5)
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)
(cherry picked from commit
966619d0ab6950fb6c90127b47d493b4c8617878)
Ruben Brunk [Mon, 24 Apr 2017 19:07:17 +0000 (12:07 -0700)]
Fix re-enabling alert window appop after leaving VR mode.
Bug:
37526753
Test: Check that system alert windows appear after leaving VR mode.
Change-Id: I2942b2e2bd30308752367963b7ae896462811d2f
(cherry picked from commit
2781b41c0eea94ededc0f216aee432838e4224c5)
Phil Weaver [Fri, 7 Apr 2017 00:40:51 +0000 (17:40 -0700)]
Make a11y node info parceling more robust
Fix a bug where a malformed Parceled representation
of an AccessibilityNodeInfo could be used to mess with
Bundles as they get reparceled.
Bug:
36491278
Test: Verified that POC no longer works, a11y cts still passes.
Change-Id: I10f24747e3ab87d77cd1deba56db4526e3aa5441
(cherry picked from commit
687bb44b437f7bb24dd3dddf072c2f646308e2ca)
(cherry picked from commit
487d8697333b1e7784394b9cd96cb590b047c513)
android-build-team Robot [Wed, 24 May 2017 22:13:00 +0000 (22:13 +0000)]
Merge cherrypicks of [
2310196,
2310339,
2310340,
2310175,
2310320,
2310321,
2310322,
2310323,
2310217,
2310311,
2310349,
2310313,
2310331,
2310314,
2310286,
2310368,
2310383,
2310272,
2310439,
2310317,
2310318,
2310370,
2310352,
2310459,
2310287,
2310384,
2310237,
2310422,
2310440,
2310372,
2310289,
2310374,
2310355,
2310461,
2310423,
2310375,
2310376,
2310385,
2310386,
2310275,
2310462,
2310442,
2310443,
2310539,
2310378,
2310445,
2310238,
2310446,
2310540,
2310335,
2310582,
2310454,
2310659,
2310392,
2310393,
2310437,
2310679,
2310626] into nyc-mr2-release
Change-Id: I16173d8e1efd1935e80bb01b2668763eda0a9314
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)
(cherry picked from commit
4911af2b8ced29dc5035dca301dc80939c9bdab5)
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)
(cherry picked from commit
966619d0ab6950fb6c90127b47d493b4c8617878)
Ruben Brunk [Mon, 24 Apr 2017 19:07:17 +0000 (12:07 -0700)]
Fix re-enabling alert window appop after leaving VR mode.
Bug:
37526753
Test: Check that system alert windows appear after leaving VR mode.
Change-Id: I2942b2e2bd30308752367963b7ae896462811d2f
(cherry picked from commit
2781b41c0eea94ededc0f216aee432838e4224c5)
Phil Weaver [Fri, 7 Apr 2017 00:40:51 +0000 (17:40 -0700)]
Make a11y node info parceling more robust
Fix a bug where a malformed Parceled representation
of an AccessibilityNodeInfo could be used to mess with
Bundles as they get reparceled.
Bug:
36491278
Test: Verified that POC no longer works, a11y cts still passes.
Change-Id: I10f24747e3ab87d77cd1deba56db4526e3aa5441
(cherry picked from commit
687bb44b437f7bb24dd3dddf072c2f646308e2ca)
(cherry picked from commit
487d8697333b1e7784394b9cd96cb590b047c513)
android-build-team Robot [Thu, 18 May 2017 00:55:40 +0000 (00:55 +0000)]
Merge cherrypicks of [
2278225,
2279882,
2279862,
2278226,
2277057,
2279863,
2278227] into nyc-mr2-pixel-monthly-release
Change-Id: I1823477516e3ccbe0ed20238b243765647417241
Wei Wang [Mon, 20 Mar 2017 23:13:40 +0000 (16:13 -0700)]
Remove bg_non_interactive cgroup [ DO NOT MERGE ]
Bug:
34193533
Test: mma
Change-Id: I0d255f47eaded15eda02a4654193a4e49c63a2c5
(cherry picked from commit
f2d2640895d564f5a1d80e185fd45464cc0c85d9)
android-build-team Robot [Wed, 17 May 2017 22:58:26 +0000 (22:58 +0000)]
release-request-
513a9883-0d18-4c2f-80ce-
cadb234b4e89-for-git_nyc-mr2-pixel-monthly-release-
3938523 snap-temp-L39300000065258774
Change-Id: Iab7629368efe3bbdc2780cf2d9617853e6dd8a49
android-build-team Robot [Wed, 17 May 2017 22:45:15 +0000 (22:45 +0000)]
release-request-
513a9883-0d18-4c2f-80ce-
cadb234b4e89-for-git_nyc-mr2-pixel-monthly-release-
3938523 snap-temp-L39300000065258774 (snap-temp-branch)
Change-Id: I4bce5f33182b1e92971f44b96d45c71ae1d68c3e
Chih-Wei Huang [Fri, 24 Mar 2017 19:13:40 +0000 (03:13 +0800)]
DiskInfo: support CD/DVD type
Chih-Wei Huang [Sat, 6 May 2017 14:39:18 +0000 (22:39 +0800)]
Merge tag 'android-7.1.2_r11' into nougat-x86
Android 7.1.2 release 11
Chih-Wei Huang [Tue, 14 Mar 2017 05:27:02 +0000 (13:27 +0800)]
Fix black background for android-x86
Since only 32-bit system is affected, we limit the workaround
provided by Phoenix OS to 32-bit only.
Chih-Wei Huang [Sun, 8 Jan 2017 16:11:43 +0000 (00:11 +0800)]
fd_utils: fix DEBUG mode booting issue
Remove the "/android/" prefix before the white list checking.
Suggested by Chris Vandomelen <chris@sightworks.com>.
Chih-Wei Huang [Sun, 30 Oct 2016 14:18:55 +0000 (22:18 +0800)]
Fix a null pointer exception in server_server
It's unclear why it only happens on Android 7.0 with kernel 4.8+.
John Stultz [Thu, 28 Jul 2016 19:35:31 +0000 (12:35 -0700)]
Zygote: Add CAP_WAKE_ALARM to system_server to properly support timerfd alarms
The when the timerfd alarm logic was added to the kernel, an oversight was made
and the interface does not check for the CAP_WAKE_ALARM permissions as required
via other kernel methods to trigger an alarm timer.
In v4.8-rc kernels, the change
2895a5e5b3a ("timerfd: Reject ALARM timerfds
without CAP_WAKE_ALARM") was added by Eric Caruso <ejcaruso@google.com>.
After this change (which may be backported to -stable), the AlarmManager will
fail on the first timerfd_create call, and will not be able to set the time
or handle other necessary functions.
The solution here is to add CAP_WAKE_ALARM to the system_server process.
Change-Id: Ifdb16f3ef42711e553f727165de3922d484b5be4
Signed-off-by: John Stultz <john.stultz@linaro.org>
Chih-Wei Huang [Tue, 18 Oct 2016 15:35:04 +0000 (23:35 +0800)]
Ignore screen size when determines mForceDefaultOrientation
Chih-Wei Huang [Wed, 21 Sep 2016 16:01:28 +0000 (00:01 +0800)]
Fix improper Chinese translation
Chih-Wei Huang [Tue, 13 Sep 2016 09:43:11 +0000 (17:43 +0800)]
Detect HDMI audio by switch events
If detect SW_VIDEOOUT_INSERT, assume HDMI is plugged.
Hugo [Wed, 6 Jul 2016 03:28:38 +0000 (11:28 +0800)]
analytics: send anonymous usage information
Send usage information to google analytics when applications are started
or throws exceptions.
Ma Jian [Sun, 12 Jun 2016 07:13:55 +0000 (15:13 +0800)]
Support save local time to RTC
Make it work for dual boot with Windows, we could set property
persist.rtc_local_time to 1, so that RemixOS and Windows both
use local time in rtc.
NO_REF_TASK
Tested:
1) set time in android, reboot to bios, make sure the time in bois is
local time
2) reboot back to android, the current time should be correct local time
(this need another change)
Change-Id: Id2c0ce150fb9320b132ad8bdd83b38dcae1070db
Chih-Wei Huang [Mon, 22 Dec 2014 04:08:17 +0000 (12:08 +0800)]
Map keycode 120 to APP_SWITCH
Define the unused keycode 120 to be APP_SWITCH.
Chih-Wei Huang [Sat, 17 May 2014 18:20:32 +0000 (02:20 +0800)]
InputReader: read the pointercal from TSCalibration2
Watch the pointercal and reload it on changed.
jshe32X [Thu, 24 Oct 2013 04:57:09 +0000 (12:57 +0800)]
SystemUI: Recycle the old wallpaper background bitmap after we choose a new wallpaper.
BZ: 101064
RootCause: ImageWallpaper didn't call old background bitmap's recycle before
set it to null.
Category: aosp improvement
Domain: AOSP-Framework-Media
Origin: internal
Upstream-Candidate: yes
Orig-Change-Id: I27f6971a3edd26472b69e59b542b27fd7c8e7b90
Change-Id: Ice59aea79f8137d5995d7a5ce9a6ed7903750d30
Signed-off-by: jshe32X<jianchunx.shen@intel.com>
Chih-Wei Huang [Fri, 13 Sep 2013 08:15:12 +0000 (16:15 +0800)]
MediaFile: support more media types
juntingwang [Wed, 24 Apr 2013 06:06:08 +0000 (14:06 +0800)]
Make "windows" key to act as "home" key
Issue: AXIA-1893
Change-Id: I7b2b19f7e34ec8a1867e8e6ce522e65133e5267f
Signed-off-by: juntingwang <Junting.Wang@windriver.com>
Chih-Wei Huang [Wed, 20 Feb 2013 17:46:17 +0000 (01:46 +0800)]
camera: fix NullPointerException
Andy Ross [Tue, 15 Jan 2013 23:05:38 +0000 (15:05 -0800)]
GLSurfaceView: Be less picky about EGLConfig alpha sizes
EGLChooseConfig returns a "best match" set of visuals meeting or
exceeding the required r/g/b/a component depths. But GLSurfaceView
oddly requires that the returned visual be an exact match. Add to
that that the (rarely used outside of CTS) default request specifies
zero alpha bits and that not all drivers expose a zero-alpha
EGLConfig, and the default configuration will fail needlessly.
It's not incorrect to have alpha bits you didn't request: the only way
to produce divergent behavior is for a fragment shader to write out
explicit alpha values (into the channel it didn't want to begin with!)
with values other than 1.0 and then rely on them being ignored and
treated as 1.0.
For: AXIA-1448
Change-Id: I2f64995d7b9de1ae082aa47822af525390102083
Signed-off-by: Andy Ross <andy.ross@windriver.com>
Matt Gumbel [Mon, 5 Nov 2012 19:21:19 +0000 (11:21 -0800)]
ImageWallpaper: don't throw-up when EGL init fails
Just fall back to non-GL path instead.
Change-Id: Icabee5b7cadd49942e9c920a7ff49a54fc8bea9f
For: AXIA-991
Signed-off-by: Matt Gumbel <matthew.k.gumbel@linux.intel.com>
Zhao Liang [Fri, 20 Jul 2012 03:56:51 +0000 (11:56 +0800)]
import YuvToEncoder R3 patches, BZ 18528, 19092, 19696
BZ: 47824
Please refer http://umgbugzilla.sh.intel.com:41006/show_bug.cgi?id=19092 and
external/jpeg/libjpeg.doc
The MCU height is max_v_samp_factor = 2 DCT rows so you must pass at least 16
scanlines on each call to jpeg_write_raw_data(), which is to say 16 actual
sample rows of Y and 8 each of Cb and Cr.
The original implement of Yuv420SpToJpegEncoder::compress didn't add padding to the frame buffer
when height and width aren't aligned with 16 pixel. It will cause illegal memory violation and core dump.
Category: aosp improvement
Domain: Video.Media-jpeg
Origin: Internal
Upstream: Yes
Change-Id: Ibcf14230d616e2d440ace244bb420723b5c01dc2
Orig-Change-Id: Ic1b7494b98ee9c1997b226d58abd034b1dcb18f6
Signed-off-by: Tong, Bo <box.tong@intel.com>
Signed-off-by: Zhao Liang <leo.zhao@intel.com>
Chih-Wei Huang [Thu, 8 Dec 2011 12:16:29 +0000 (20:16 +0800)]
disables hardware acceleration if debug.egl.hw=0
android-build-team Robot [Fri, 21 Apr 2017 20:42:02 +0000 (20:42 +0000)]
Merge cherrypicks of [
2007123,
2089669,
2072002,
2094113,
1989895,
2094094,
2017568,
2054111,
2054025,
2074928,
2066476,
2092431,
2053944,
2095243,
2092549,
2065088,
2007730,
2008313,
2053983,
2025333,
2094716,
2026590,
2059276,
2089422,
2080090] into nyc-mr2-pixel-monthly-release
Change-Id: I744c621a943d3657db09c7f4d9b3eef92bae387e
Wei Wang [Mon, 20 Mar 2017 23:13:40 +0000 (16:13 -0700)]
Remove bg_non_interactive cgroup [ DO NOT MERGE ]
Change-Id: I794545635e5d4c1007322e6bcb4e3d9b597c7de1
android-build-team Robot [Fri, 21 Apr 2017 17:29:56 +0000 (17:29 +0000)]
release-request-
762540b1-1728-41bc-a9ce-
e977f3e2683f-for-git_nyc-mr2-pixel-monthly-release-
3888830 snap-temp-L22300000056915770
Change-Id: I216cf2391ea23463c2df44e549cb1f7add65212a
android-build-team Robot [Thu, 20 Apr 2017 22:40:11 +0000 (22:40 +0000)]
Merge cherrypicks of [
2089422,
2053944,
2094094,
2007730,
2072002,
2065088,
1989895,
2080090,
2026590,
2008313,
2089669,
2059276,
2094716,
2066476,
2053983,
2007123,
2017568,
2054111,
2054025,
2095243,
2092431,
2092549,
2025333,
2099168,
2074928] into nyc-mr2-pixel-monthly-release
Change-Id: I4a8cb0109b07a372131d3c860f262c27ef1e5769
Wei Wang [Mon, 20 Mar 2017 23:13:40 +0000 (16:13 -0700)]
Remove bg_non_interactive cgroup [ DO NOT MERGE ]
Change-Id: I1c35df7af97b986c1a0d7881fc4d7823dc4eb38e
Svetoslav Ganov [Thu, 29 Dec 2016 22:36:58 +0000 (14:36 -0800)]
[DO NOT MERGE] Don't allow permission change to runtime
Prevent apps to change permission protection level to dangerous
from any other type as this would allow a privilege escalation
where an app adds a normal permission in other app's group and
then redefines it as dangerous leading to the group auto-grant.
Test: Added a CTS test which passes.
Bug:
33860747
Change-Id: I1ccf546f78ee79ff027cb98124be81c8e5265a82
(cherry picked from commit
fe430be9f102893c95258cc81589df132b7d02b3)
Fyodor Kupolov [Wed, 22 Feb 2017 22:12:50 +0000 (14:12 -0800)]
[DO NOT MERGE] Throw exception if slot has invalid offset
Previously the process would crash, which is OK, but complicates testing.
Test: cts-tradefed run cts --module CtsContentTestCases
--test android.content.cts.ContentProviderCursorWindowTest
Bug:
34128677
Change-Id: I5b50982d77ec65c442fbb973d14c85a5c29c43c7
(cherry picked from commit
eb6de6f5f10148b9f81f9c0074d1e1f7af21bfb0)
(cherry picked from commit
676f703f746391cfdf05bafd2289226f7a6e5255)
Fyodor Kupolov [Tue, 28 Feb 2017 01:33:18 +0000 (17:33 -0800)]
[DO NOT MERGE] Check bounds in offsetToPtr
Check whether specified offset belongs to mData.
Also added a default argument bufferSize to check the end offset.
Size of the ashmem descriptor can be modified between
ashmem_get_size_region call and mmap. createFromParcel method was updated
to check ashmem size again immediately after memory is mapped.
Test: manual - using the test app from the bug
Bug:
34128677
Change-Id: I3ecd1616a870ce20941ce9b20a1843d2b4295750
(cherry picked from commit
45e2e95c2ffeb2d978e2cce80b729ef6ada3b8d2)
(cherry picked from commit
acede24109412a4c09e6e4e93d7b96bc9b1ad440)
Kenny Guy [Tue, 17 Jan 2017 23:33:41 +0000 (23:33 +0000)]
Fix issue with saving admins before finishing loading.
Saving device policy managers settings to clear out
password stats was happening before initializing mAdminList
so could wipe active admins.
Test: manual - flash with N2G05C add google account with dmagent flash wth this fix, check dmagent is still an active admin, reboot check admin is still active.
Test: runtest -c com.android.server.devicepolicy.DevicePolicyManagerTest frameworks-services
Bug:
34277435
Change-Id: I13660b47f30e9aba001eb13f2e457c3b3f36da3e
(cherry picked from commit
adbda7474cc1968b66e9948aee566dc346e71340)
Thomas Joseph Avila [Thu, 6 Apr 2017 22:11:30 +0000 (22:11 +0000)]
Merge "Protect Bluetooth OPP ACCEPT and DECLINE broadcast" into nyc-mr2-security-a-release
Andrew Scull [Fri, 13 Jan 2017 15:28:36 +0000 (15:28 +0000)]
resolve merge conflicts of
ad4aa1ce7d3d to nyc-mr1-dev
fix conflict in nyc-mr2-release
Change-Id: I97ef31536cd06495a08a3f94f81df2d1376186e0
(cherry picked from commit
f806d65e615b942c268a5f68d44bde9d55634972)
Marie Janssen [Wed, 8 Mar 2017 18:12:07 +0000 (10:12 -0800)]
Protect Bluetooth OPP ACCEPT and DECLINE broadcast
Fix merge conflict into nyc-mr2-release
Non-system apps could send these, and accept OPP transfers without user
interaction.
Test: run POC code, see that it crashes instaed of accepting
Bug:
35258579
Change-Id: I37bf2e17b4d612258f9dbaa879727ac7c72e5969
(cherry picked from commit
667d2cbe3eb1450f273a4f6595ccef35e1f0fe4b)
gitbuildkicker [Thu, 30 Mar 2017 23:17:57 +0000 (16:17 -0700)]
merge in nyc-mr2-release history after reset to
ceda4a98bcb08f311ba5744ee95e8754b3b5f219
gitbuildkicker [Thu, 30 Mar 2017 18:46:15 +0000 (11:46 -0700)]
merge in nyc-mr2-release history after reset to
1a5fdccc6d10acc50911b98a52ea2d3931154fef
gitbuildkicker [Mon, 27 Mar 2017 18:10:13 +0000 (11:10 -0700)]
merge in nyc-mr2-release history after reset to nyc-mr2-dev
Wei Wang [Mon, 20 Mar 2017 23:13:40 +0000 (16:13 -0700)]
Remove bg_non_interactive cgroup [ DO NOT MERGE ]
Bug:
34193533
Test: mma
Change-Id: I0d255f47eaded15eda02a4654193a4e49c63a2c5
(cherry picked from commit
f2d2640895d564f5a1d80e185fd45464cc0c85d9)
Svetoslav Ganov [Thu, 29 Dec 2016 22:36:58 +0000 (14:36 -0800)]
[DO NOT MERGE] Don't allow permission change to runtime
Prevent apps to change permission protection level to dangerous
from any other type as this would allow a privilege escalation
where an app adds a normal permission in other app's group and
then redefines it as dangerous leading to the group auto-grant.
Test: Added a CTS test which passes.
Bug:
33860747
Change-Id: I1ccf546f78ee79ff027cb98124be81c8e5265a82
(cherry picked from commit
fe430be9f102893c95258cc81589df132b7d02b3)
Fyodor Kupolov [Wed, 22 Feb 2017 22:12:50 +0000 (14:12 -0800)]
[DO NOT MERGE] Throw exception if slot has invalid offset
Previously the process would crash, which is OK, but complicates testing.
Test: cts-tradefed run cts --module CtsContentTestCases
--test android.content.cts.ContentProviderCursorWindowTest
Bug:
34128677
Change-Id: I5b50982d77ec65c442fbb973d14c85a5c29c43c7
(cherry picked from commit
eb6de6f5f10148b9f81f9c0074d1e1f7af21bfb0)
(cherry picked from commit
676f703f746391cfdf05bafd2289226f7a6e5255)
Fyodor Kupolov [Tue, 28 Feb 2017 01:33:18 +0000 (17:33 -0800)]
[DO NOT MERGE] Check bounds in offsetToPtr
Check whether specified offset belongs to mData.
Also added a default argument bufferSize to check the end offset.
Size of the ashmem descriptor can be modified between
ashmem_get_size_region call and mmap. createFromParcel method was updated
to check ashmem size again immediately after memory is mapped.
Test: manual - using the test app from the bug
Bug:
34128677
Change-Id: I3ecd1616a870ce20941ce9b20a1843d2b4295750
(cherry picked from commit
45e2e95c2ffeb2d978e2cce80b729ef6ada3b8d2)
(cherry picked from commit
acede24109412a4c09e6e4e93d7b96bc9b1ad440)
Kenny Guy [Tue, 17 Jan 2017 23:33:41 +0000 (23:33 +0000)]
Fix issue with saving admins before finishing loading.
Saving device policy managers settings to clear out
password stats was happening before initializing mAdminList
so could wipe active admins.
Test: manual - flash with N2G05C add google account with dmagent flash wth this fix, check dmagent is still an active admin, reboot check admin is still active.
Test: runtest -c com.android.server.devicepolicy.DevicePolicyManagerTest frameworks-services
Bug:
34277435
Change-Id: I13660b47f30e9aba001eb13f2e457c3b3f36da3e
(cherry picked from commit
adbda7474cc1968b66e9948aee566dc346e71340)
Thomas Joseph Avila [Wed, 22 Mar 2017 19:15:17 +0000 (19:15 +0000)]
Merge "Protect Bluetooth OPP ACCEPT and DECLINE broadcast" into nyc-mr2-release
Andrew Scull [Fri, 13 Jan 2017 15:28:36 +0000 (15:28 +0000)]
resolve merge conflicts of
ad4aa1ce7d3d to nyc-mr1-dev
fix conflict in nyc-mr2-release
Change-Id: I97ef31536cd06495a08a3f94f81df2d1376186e0
Marie Janssen [Wed, 8 Mar 2017 18:12:07 +0000 (10:12 -0800)]
Protect Bluetooth OPP ACCEPT and DECLINE broadcast
Fix merge conflict into nyc-mr2-release
Non-system apps could send these, and accept OPP transfers without user
interaction.
Test: run POC code, see that it crashes instaed of accepting
Bug:
35258579
Change-Id: I37bf2e17b4d612258f9dbaa879727ac7c72e5969
Daniel Nishi [Wed, 22 Feb 2017 00:04:20 +0000 (16:04 -0800)]
Don't crash when primary volume is null in AppCollector.
getPrimaryStorageCurrentVolume() may return a null value. I did
not plan for this case in the AppCollector. This case occurs when
the primary storage is not mounted when the function is called.
By adding in a null check after getPrimaryStorageCurrentVolume()
and adding in preconditions to verify the non-nullness of the
volume as it propagates through the AppCollector, we ensure that
there should be no more NPE crashes for this reason.
Bug:
35636901
Test: FrameworkServicesTests
Change-Id: I4009e55502f71b8f14dd917ddd00caef3551aafd
(cherry picked from commit
d54f3a487bba1dc5008e2e1482ef451a59500752)
Meng Wang [Wed, 15 Feb 2017 05:55:09 +0000 (21:55 -0800)]
Add carrierconfig KEY_CARRIER_VOLTE_OVERRIDE_WFC_PROVISIONING_BOOL
Bug:
28709116
Change-Id: I19673ef092ebbd655e3d687fc8d92bd9f67c5645
(cherry picked from commit
0506299343e463598b819526cb6db6f46c2275f6)
Xiaohui Chen [Tue, 14 Feb 2017 22:55:07 +0000 (14:55 -0800)]
ReolverActivity: try auto launching single choice
We already does this on start. Now we also do the same when
the list of options changes.
Test: locally on device
Bug:
34470067
Change-Id: Ib184d67b532c5afd584fb9cd52daac69a7c50d0a
(cherry picked from commit
393c8018a1123f869698269e678876e03a5160ba)
gitbuildkicker [Thu, 16 Feb 2017 08:09:47 +0000 (00:09 -0800)]
merge in nyc-mr2-release history after reset to nyc-mr2-dev
TreeHugger Robot [Thu, 16 Feb 2017 03:02:14 +0000 (03:02 +0000)]
Merge "DO NOT MERGE - Ensuring that there are per-user last stack active times." into nyc-mr2-dev
Hall Liu [Thu, 16 Feb 2017 01:09:34 +0000 (01:09 +0000)]
Merge "Add extra key for app-specified outgoing call timeout" into nyc-mr2-dev
Chris Tate [Thu, 16 Feb 2017 00:50:56 +0000 (00:50 +0000)]
Merge "Harden against jobscheduler client app misbehavior" into nyc-mr2-dev
Manu Cornet [Thu, 16 Feb 2017 00:37:16 +0000 (16:37 -0800)]
DO NOT MERGE - Ensuring that there are per-user last stack active times.
- This fixes an issue where the last stack active time would be clobbered
when switching between users. With the policy in the phone/stack
recents, this is fine, but with the grid recents, it no longer only
applies when out of the historical window, so it is always wrong (it
would normally be wrong if switching back from another user after the
historical time of six hours).
This CL will migrate the last stack active time to a per-user secure
setting, which will be used going forward.
[This is a manual merge of change
1913535]
Bug:
35375206
Test: On the Ryu, launch some tasks, switch users, launch more tasks, and
return to the original user
Change-Id: Idc72920240093d15f822f5d9e3ee11b12a56edae
Hall Liu [Wed, 15 Feb 2017 02:11:11 +0000 (18:11 -0800)]
Add extra key for app-specified outgoing call timeout
Bug:
34474757
Test: manual
Merged-In: I6e7e67c946205b28440a4daeeab3a002f8d6bccc
Change-Id: Ia93d68d6a01308b0b93b88977daf983a0ed3a22c
gitbuildkicker [Wed, 15 Feb 2017 08:09:34 +0000 (00:09 -0800)]
merge in nyc-mr2-release history after reset to nyc-mr2-dev
Michael Kwan [Tue, 14 Feb 2017 22:53:41 +0000 (22:53 +0000)]
Merge "Fix incorrect values for VelocityTracker in SwipeDismissLayout." into cw-f-dev
am:
c61cd1a635
Change-Id: Ib1cff2ace082862c2a1c250170453b989f6697df
TreeHugger Robot [Tue, 14 Feb 2017 22:46:57 +0000 (22:46 +0000)]
Merge "Fix incorrect values for VelocityTracker in SwipeDismissLayout." into cw-f-dev