OSDN Git Service

android-x86/frameworks-base.git
7 years agolibmedia_jni.so doesn't need libjhead.so am: 9a4a34afd8 -s ours am: 398d50feeb ...
Marco Nelissen [Fri, 16 Jun 2017 17:12:09 +0000 (17:12 +0000)]
libmedia_jni.so doesn't need libjhead.so am: 9a4a34afd8  -s ours am: 398d50feeb  -s ours am: 49fc959be3  -s ours am: 23118a9b77  -s ours am: 45cd809caa  -s ours am: ce4c7df6a0  -s ours am: 035e2a5c37  -s ours am: 4e5ed845c7  -s ours am: 3cd244e872  -s ours
am: a9bf75f50c  -s ours

Change-Id: Ib75388665c3586c09e963917bc54b020aae22dce

7 years agolibmedia_jni.so doesn't need libjhead.so am: 9a4a34afd8 -s ours am: 398d50feeb ...
Marco Nelissen [Fri, 16 Jun 2017 16:59:57 +0000 (16:59 +0000)]
libmedia_jni.so doesn't need libjhead.so am: 9a4a34afd8  -s ours am: 398d50feeb  -s ours am: 49fc959be3  -s ours am: 23118a9b77  -s ours am: 45cd809caa  -s ours am: ce4c7df6a0  -s ours am: 035e2a5c37  -s ours am: 4e5ed845c7  -s ours
am: 3cd244e872  -s ours

Change-Id: I256e1413df73fd577708d5dcb84074e3a8ed61ab

7 years agolibmedia_jni.so doesn't need libjhead.so am: 9a4a34afd8 -s ours am: 398d50feeb ...
Marco Nelissen [Fri, 16 Jun 2017 16:51:14 +0000 (16:51 +0000)]
libmedia_jni.so doesn't need libjhead.so am: 9a4a34afd8  -s ours am: 398d50feeb  -s ours am: 49fc959be3  -s ours am: 23118a9b77  -s ours am: 45cd809caa  -s ours am: ce4c7df6a0  -s ours am: 035e2a5c37  -s ours
am: 4e5ed845c7  -s ours

Change-Id: Iae9f79e4b91c4ef5e844259709e3055607a781b8

7 years agolibmedia_jni.so doesn't need libjhead.so am: 9a4a34afd8 -s ours am: 398d50feeb ...
Marco Nelissen [Fri, 16 Jun 2017 16:41:20 +0000 (16:41 +0000)]
libmedia_jni.so doesn't need libjhead.so am: 9a4a34afd8  -s ours am: 398d50feeb  -s ours am: 49fc959be3  -s ours am: 23118a9b77  -s ours am: 45cd809caa  -s ours am: ce4c7df6a0  -s ours
am: 035e2a5c37  -s ours

Change-Id: Ib6f84a832e27329e0eabf000b89e93145c43a31a

7 years agolibmedia_jni.so doesn't need libjhead.so am: 9a4a34afd8 -s ours am: 398d50feeb ...
Marco Nelissen [Fri, 16 Jun 2017 16:26:30 +0000 (16:26 +0000)]
libmedia_jni.so doesn't need libjhead.so am: 9a4a34afd8  -s ours am: 398d50feeb  -s ours am: 49fc959be3  -s ours am: 23118a9b77  -s ours am: 45cd809caa  -s ours
am: ce4c7df6a0  -s ours

Change-Id: I1fb798481ca56b8c81386792b5642a544aae1c7e

7 years agolibmedia_jni.so doesn't need libjhead.so am: 9a4a34afd8 -s ours am: 398d50feeb ...
Marco Nelissen [Fri, 16 Jun 2017 16:19:02 +0000 (16:19 +0000)]
libmedia_jni.so doesn't need libjhead.so am: 9a4a34afd8  -s ours am: 398d50feeb  -s ours am: 49fc959be3  -s ours am: 23118a9b77  -s ours
am: 45cd809caa  -s ours

Change-Id: Idd7b2d2536d1c25072794ba228f33fc2459f2aaa

7 years agolibmedia_jni.so doesn't need libjhead.so am: 9a4a34afd8 -s ours am: 398d50feeb ...
Marco Nelissen [Fri, 16 Jun 2017 16:11:01 +0000 (16:11 +0000)]
libmedia_jni.so doesn't need libjhead.so am: 9a4a34afd8  -s ours am: 398d50feeb  -s ours am: 49fc959be3  -s ours
am: 23118a9b77  -s ours

Change-Id: Id314511cf3e6af08e0f00e84e8945ea404b85c6a

7 years agolibmedia_jni.so doesn't need libjhead.so am: 9a4a34afd8 -s ours am: 398d50feeb ...
Marco Nelissen [Fri, 16 Jun 2017 16:02:19 +0000 (16:02 +0000)]
libmedia_jni.so doesn't need libjhead.so am: 9a4a34afd8  -s ours am: 398d50feeb  -s ours
am: 49fc959be3  -s ours

Change-Id: I0eb248911ce1a582a4939e2bd5419659c586128f

7 years agolibmedia_jni.so doesn't need libjhead.so am: 9a4a34afd8 -s ours
Marco Nelissen [Fri, 16 Jun 2017 15:51:48 +0000 (15:51 +0000)]
libmedia_jni.so doesn't need libjhead.so am: 9a4a34afd8  -s ours
am: 398d50feeb  -s ours

Change-Id: Ide31821909dde91443cdf650216a6ada7277ce9a

7 years agolibmedia_jni.so doesn't need libjhead.so
Marco Nelissen [Fri, 16 Jun 2017 15:43:46 +0000 (15:43 +0000)]
libmedia_jni.so doesn't need libjhead.so
am: 9a4a34afd8  -s ours

Change-Id: I557d7e96401b742d916e2eef5aa03949018382c7

7 years agolibmedia_jni.so doesn't need libjhead.so
Marco Nelissen [Fri, 9 Jun 2017 22:07:38 +0000 (15:07 -0700)]
libmedia_jni.so doesn't need libjhead.so

Bug: 37776688
Merged-In: I0e0e6209be7a9d3e493abdcee8619cae6d4b9501
Change-Id: I18f0b6b88a9c0b117839497f081549404d5edc40

7 years agoAdd missing values for screen percent width dimens
Todd Lee [Wed, 3 May 2017 23:22:42 +0000 (16:22 -0700)]
Add missing values for screen percent width dimens

Protects against bootlooping in the event that developer
inadvertently changes DPI to unsupported value for device.

Use 0dp as it will not be mistaken for anything other
than a broken experience (cts test to validate device DPIs
so as to avoid shipping with this).

bug: b/37755288
Change-Id: Ie9f4aa0d6d226383824e06d28151e06038d0110b

7 years agoMerge "Close connection before retrying" into lmp-dev am: a8648ecebb am: 5181a7ab64...
Marco Nelissen [Wed, 7 Jun 2017 00:04:12 +0000 (00:04 +0000)]
Merge "Close connection before retrying" into lmp-dev am: a8648ecebb am: 5181a7ab64 am: 4b78a79546 am: 6d5bc9a3c2 am: 3272cf26c1 am: e18e8c4113 am: 69b6a382a3 am: ce5c72e887 am: 4d9e6150f3
am: d7fe3ea6a8

Change-Id: Ic5a7104241d36e82418ce5a2a43595d2fa4bff47

7 years agoMerge "Close connection before retrying" into lmp-dev am: a8648ecebb am: 5181a7ab64...
Marco Nelissen [Tue, 6 Jun 2017 23:54:55 +0000 (23:54 +0000)]
Merge "Close connection before retrying" into lmp-dev am: a8648ecebb am: 5181a7ab64 am: 4b78a79546 am: 6d5bc9a3c2 am: 3272cf26c1 am: e18e8c4113 am: 69b6a382a3 am: ce5c72e887
am: 4d9e6150f3

Change-Id: I5ede1388f265920fa5dd835c4a6335380daa9103

7 years agoMerge "Close connection before retrying" into lmp-dev am: a8648ecebb am: 5181a7ab64...
Marco Nelissen [Tue, 6 Jun 2017 23:45:51 +0000 (23:45 +0000)]
Merge "Close connection before retrying" into lmp-dev am: a8648ecebb am: 5181a7ab64 am: 4b78a79546 am: 6d5bc9a3c2 am: 3272cf26c1 am: e18e8c4113 am: 69b6a382a3
am: ce5c72e887

Change-Id: I081f15c5d6bb16b3f490e53dbc2910a45e6a920b

7 years agoMerge "Close connection before retrying" into lmp-dev am: a8648ecebb am: 5181a7ab64...
Marco Nelissen [Tue, 6 Jun 2017 23:39:57 +0000 (23:39 +0000)]
Merge "Close connection before retrying" into lmp-dev am: a8648ecebb am: 5181a7ab64 am: 4b78a79546 am: 6d5bc9a3c2 am: 3272cf26c1 am: e18e8c4113
am: 69b6a382a3

Change-Id: I2c599bac680bda5d4dcfa4f3b9fb5f1413839da0

7 years agoMerge "Close connection before retrying" into lmp-dev am: a8648ecebb am: 5181a7ab64...
Marco Nelissen [Tue, 6 Jun 2017 23:33:50 +0000 (23:33 +0000)]
Merge "Close connection before retrying" into lmp-dev am: a8648ecebb am: 5181a7ab64 am: 4b78a79546 am: 6d5bc9a3c2 am: 3272cf26c1
am: e18e8c4113

Change-Id: I5c34b680b1c7abcfd33c8719406516fe796afebb

7 years agoMerge "Close connection before retrying" into lmp-dev am: a8648ecebb am: 5181a7ab64...
Marco Nelissen [Tue, 6 Jun 2017 23:28:27 +0000 (23:28 +0000)]
Merge "Close connection before retrying" into lmp-dev am: a8648ecebb am: 5181a7ab64 am: 4b78a79546 am: 6d5bc9a3c2
am: 3272cf26c1

Change-Id: I92f069aa6f3a897f9bfba4405dcd64dc066db944

7 years agoMerge "Close connection before retrying" into lmp-dev am: a8648ecebb am: 5181a7ab64...
Marco Nelissen [Tue, 6 Jun 2017 23:22:14 +0000 (23:22 +0000)]
Merge "Close connection before retrying" into lmp-dev am: a8648ecebb am: 5181a7ab64 am: 4b78a79546
am: 6d5bc9a3c2

Change-Id: I8165c2218d0d5de41468f8acff86a720c03d1f52

7 years agoMerge "Close connection before retrying" into lmp-dev am: a8648ecebb am: 5181a7ab64
Marco Nelissen [Tue, 6 Jun 2017 23:16:24 +0000 (23:16 +0000)]
Merge "Close connection before retrying" into lmp-dev am: a8648ecebb am: 5181a7ab64
am: 4b78a79546

Change-Id: Iceb4edfd80a0a483d28f2624669eff9dd86bfcb8

7 years agoMerge "Close connection before retrying" into lmp-dev am: a8648ecebb
Marco Nelissen [Tue, 6 Jun 2017 23:10:16 +0000 (23:10 +0000)]
Merge "Close connection before retrying" into lmp-dev am: a8648ecebb
am: 5181a7ab64

Change-Id: I34a176a0da235836eaa9e44b843ec5d5654b8db9

7 years agoMerge "Close connection before retrying" into lmp-dev
Marco Nelissen [Tue, 6 Jun 2017 23:02:35 +0000 (23:02 +0000)]
Merge "Close connection before retrying" into lmp-dev
am: a8648ecebb

Change-Id: I744fdb979aa2803b53d3ff6f4e3e72f6f1160d74

7 years agoMerge "Close connection before retrying" into lmp-dev
TreeHugger Robot [Tue, 6 Jun 2017 22:53:55 +0000 (22:53 +0000)]
Merge "Close connection before retrying" into lmp-dev

7 years agoMerge "Revert "Fix race condition triggered by quick stop/start of Dream"" into cw...
TreeHugger Robot [Mon, 5 Jun 2017 21:24:44 +0000 (21:24 +0000)]
Merge "Revert "Fix race condition triggered by quick stop/start of Dream"" into cw-f-dev

7 years agoRevert "Fix race condition triggered by quick stop/start of Dream"
Erik Wolsheimer [Mon, 5 Jun 2017 16:49:28 +0000 (16:49 +0000)]
Revert "Fix race condition triggered by quick stop/start of Dream"

Causes another race condition

This reverts commit 69515b2261335be4bd8510ed5a40a6bed3d7b48f.

Bug: 62147987
Change-Id: Ibe6f9bc14ed6cc35d3a23d52300657eaed9bb6d8

7 years agoClose connection before retrying
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

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 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 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 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 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 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 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 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 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 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 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 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 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 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 agoFix race condition triggered by quick stop/start of Dream
Erik Wolsheimer [Wed, 17 May 2017 18:20:43 +0000 (11:20 -0700)]
Fix race condition triggered by quick stop/start of Dream

Bug: 28455483
Change-Id: I20de24c68e468e61bb8fc704bacf73dc6df63b0a

7 years agoDO NOT MERGE: Add light sample filtering logic for devices with
Julius D'souza [Wed, 5 Apr 2017 02:39:05 +0000 (19:39 -0700)]
DO NOT MERGE: Add light sample filtering logic for devices with
ambient light sensors that can be regularly obstructed.

Bug: 36869173

Change-Id: Ie2a1399c149c87df657b265911a7bb8417a1b8b9

7 years agoDO NOT MERGE Adjust WALLPAPER_RECONNECT_TIMEOUT_MS in WallpaperManagerService to 15s
Erik Wolsheimer [Mon, 1 May 2017 21:58:31 +0000 (14:58 -0700)]
DO NOT MERGE Adjust WALLPAPER_RECONNECT_TIMEOUT_MS in WallpaperManagerService to 15s

Bug: 37773684
Change-Id: Ifeeb26a164c7bab59561721d10a4915ed6d9dcf3

7 years agoAdd logging around dream start/stop
Erik Wolsheimer [Thu, 27 Apr 2017 21:32:46 +0000 (14:32 -0700)]
Add logging around dream start/stop

Bug: 28455483
Change-Id: I31d4d52c3ed4cbfc6f6a9d978fd2669224ba95b4

7 years agoMerge "documentation fixes" into nyc-mr1-dev
David Farrow [Thu, 27 Apr 2017 17:09:26 +0000 (17:09 +0000)]
Merge "documentation fixes" into nyc-mr1-dev
am: 14826e5489

Change-Id: I18df5f88d8f72ec74e62b39a056459e4e715b9db

7 years agoMerge "documentation fixes" into nyc-mr1-dev
David Farrow [Thu, 27 Apr 2017 17:01:09 +0000 (17:01 +0000)]
Merge "documentation fixes" into nyc-mr1-dev

7 years agoDO NOT MERGE: change SET_DISPLAY_OFFSET namespace to com.android.permission.*
Julius D'souza [Wed, 26 Apr 2017 18:14:00 +0000 (11:14 -0700)]
DO NOT MERGE: change SET_DISPLAY_OFFSET namespace to com.android.permission.*
This is to avoid API Level 25 CTS issues.

Bug: 37646165
Change-Id: I1fec4dc0b7497eb3dafb9c2f704bb02b8ecde1a9

7 years agoMerge "DO NOT MERGE ANYWHERE: Move content from verison 123 to 122, and skip verison...
TreeHugger Robot [Wed, 19 Apr 2017 18:21:43 +0000 (18:21 +0000)]
Merge "DO NOT MERGE ANYWHERE: Move content from verison 123 to 122, and skip verison 123." into cw-f-dev

7 years agoDO NOT MERGE ANYWHERE: Move content from verison 123 to 122, and skip verison 123.
Zheng Zhang [Wed, 19 Apr 2017 01:16:33 +0000 (18:16 -0700)]
DO NOT MERGE ANYWHERE: Move content from verison 123 to 122, and skip verison 123.

HFP profile config landed late in Emerald development, and was committed
as version 122 there.
When it merged to master, there were conflicts since 122 was already
taken, so it was resolved as version 123.
We didn't catch the subtle bug then:
This means Emerald devices will reset HFP profile config in error once
they upgrade to Feldspar.
Correct this by merging 122, and making 123 a no-op.

Bug: 37338202
Change-Id: Ibf4c824d27300641fd1bb15f5884baf056bd8d7e

7 years agoDO NOT MERGE Mask case of base or tree permission being null
Erik Wolsheimer [Tue, 18 Apr 2017 16:27:31 +0000 (09:27 -0700)]
DO NOT MERGE Mask case of base or tree permission being null

Bug: 34850544
Change-Id: I4bf9e85d7e615ccdb75752503e58d7e7f47b04c2

7 years agoMerge "DO NOT MERGE Notify keyguard of when power button is pressed." into cw-f-dev
Andrew Zeng [Fri, 14 Apr 2017 19:40:51 +0000 (19:40 +0000)]
Merge "DO NOT MERGE Notify keyguard of when power button is pressed." into cw-f-dev

7 years agoDO NOT MERGE Notify keyguard of when power button is pressed.
Andrew Zeng [Fri, 17 Mar 2017 00:25:07 +0000 (17:25 -0700)]
DO NOT MERGE Notify keyguard of when power button is pressed.

This is done on wear power button doesn't turn off the screen,
when the device wakes from keyguard UI isn't visible yet, so
it needs to react to power press in some way.

Bug: 35147955
Change-Id: I22619ea446770d09b53370e9244215646b60a9db

7 years agoDocs: Fixes broken link in Javadoc. am: df0fd34d50 am: 506a8b39fb
Dave Friedman [Thu, 13 Apr 2017 17:06:11 +0000 (17:06 +0000)]
Docs: Fixes broken link in Javadoc. am: df0fd34d50 am: 506a8b39fb
am: 4eff74f8cb

Change-Id: Id237b5c6ead732111feb29e1dc0dcd8a444366ee

7 years agoDocs: Fixes broken link in Javadoc. am: df0fd34d50
Dave Friedman [Thu, 13 Apr 2017 17:00:44 +0000 (17:00 +0000)]
Docs: Fixes broken link in Javadoc. am: df0fd34d50
am: 506a8b39fb

Change-Id: If60b7db71fe92508daaec1255c637927432d7b55

7 years agoDocs: Fixes broken link in Javadoc.
Dave Friedman [Thu, 13 Apr 2017 16:48:41 +0000 (16:48 +0000)]
Docs: Fixes broken link in Javadoc.
am: df0fd34d50

Change-Id: I76ed5361426065d5e532c5a11c2d11f28ba8c2d7

7 years agoMerge "[DO NOT MERGE] Allow multiple toasts for the focused app" into cw-f-dev
TreeHugger Robot [Wed, 12 Apr 2017 21:00:21 +0000 (21:00 +0000)]
Merge "[DO NOT MERGE] Allow multiple toasts for the focused app" into cw-f-dev

7 years agoDO NOT MERGE: Remove the development privelege level from SET_DISPLAY_OFFSET.
Julius D'souza [Wed, 12 Apr 2017 06:41:27 +0000 (23:41 -0700)]
DO NOT MERGE: Remove the development privelege level from SET_DISPLAY_OFFSET.

Bug: 36515029
Test: the build still works.
Change-Id: I39ae2c55b6b2b0d6547f75f4ef06e62e3e5f0b84
(cherry picked from commit 8e9ea907448c49f573dd045707e37dd14efdf152)

7 years ago[DO NOT MERGE] Allow multiple toasts for the focused app
Svet Ganov [Mon, 5 Dec 2016 17:03:24 +0000 (09:03 -0800)]
[DO NOT MERGE] Allow multiple toasts for the focused app

We don't allow apps to add multiple toast windows to
prevent an attacker to keep adding the same toast as
a workaround for our measure to ensure toast windows
are removed after a timeout. The may cause backwards
compatibility issue for apps that add multiple toasts.
While we need to fix the security vulnerability it is
desirable to make the fix as backwards compatible as
possible. This change allows the focused app to add
as many toast windows as it wants since they will be
removed after the timeout and once the app is not the
one the user uses it will lose the multiple toast add
capability.

bug:30150688

Change-Id: I2d9295926cb49b5bb80c7af2546872ff8ca22c64
(cherry picked from commit 296a60acc3d67cea23bae167dbcb51c0d0d60b23)

7 years agoMerge "DO NOT MERGE: Add WearDisplayService to the system server; add a SET_DISPLAY_O...
Julius D'souza [Wed, 12 Apr 2017 01:41:38 +0000 (01:41 +0000)]
Merge "DO NOT MERGE: Add WearDisplayService to the system server; add a SET_DISPLAY_OFFSET permission." into cw-f-dev

7 years agoDocs: Fixes broken link in Javadoc.
Dave Friedman [Mon, 10 Apr 2017 21:50:24 +0000 (14:50 -0700)]
Docs: Fixes broken link in Javadoc.

Bug: 37198106
Change-Id: If005bf563f7bd97f794261e03d46c7b092955a89

7 years agoMerge "Make a11y node info parceling more robust" into lmp-mr1-dev am: 88698afd01...
Phil Weaver [Sat, 8 Apr 2017 00:32:37 +0000 (00:32 +0000)]
Merge "Make a11y node info parceling more robust" into lmp-mr1-dev am: 88698afd01 am: 7cb5e1dfd1 am: d7552dc819 am: e3a1b81c8f am: 879bdbeb37 am: f580a2c257 am: 68a93d2be2 am: c7db1bf43a
am: 593df9d186

Change-Id: I464fafbf67c1985cc56188914e0fabcc0970fac2

7 years agoMerge "Make a11y node info parceling more robust" into lmp-mr1-dev am: 88698afd01...
Phil Weaver [Sat, 8 Apr 2017 00:25:13 +0000 (00:25 +0000)]
Merge "Make a11y node info parceling more robust" into lmp-mr1-dev am: 88698afd01 am: 7cb5e1dfd1 am: d7552dc819 am: e3a1b81c8f am: 879bdbeb37 am: f580a2c257 am: 68a93d2be2
am: c7db1bf43a

Change-Id: I19e1e68857f43e9d36240753d2f5c72374b566b1

7 years agoMerge "Make a11y node info parceling more robust" into lmp-mr1-dev am: 88698afd01...
Phil Weaver [Sat, 8 Apr 2017 00:17:24 +0000 (00:17 +0000)]
Merge "Make a11y node info parceling more robust" into lmp-mr1-dev am: 88698afd01 am: 7cb5e1dfd1 am: d7552dc819 am: e3a1b81c8f am: 879bdbeb37 am: f580a2c257
am: 68a93d2be2

Change-Id: I3ea690e5ee140b0f0e38935adabda3aeeb9e57cb

7 years agoMake a11y node info parceling more robust am: 1d8eb49073 am: 93c47c9d07 am: 3a7cf1f05...
Phil Weaver [Sat, 8 Apr 2017 00:17:11 +0000 (00:17 +0000)]
Make a11y node info parceling more robust am: 1d8eb49073 am: 93c47c9d07 am: 3a7cf1f057  -s ours am: d3a4f4a33c am: 384e51767d am: e4beeeb423 am: 8e6d10c65f am: ba05c14397 am: 88bd259e8d
am: 1552348b31

Change-Id: I8736c7cebdc8dc954b6e008e0c61c6b85f4d8fcb

7 years agoMerge "Make a11y node info parceling more robust" into lmp-mr1-dev am: 88698afd01...
Phil Weaver [Sat, 8 Apr 2017 00:09:44 +0000 (00:09 +0000)]
Merge "Make a11y node info parceling more robust" into lmp-mr1-dev am: 88698afd01 am: 7cb5e1dfd1 am: d7552dc819 am: e3a1b81c8f am: 879bdbeb37
am: f580a2c257

Change-Id: I25bc8884d004bfc9790d40cb8f1ad1a285203e98

7 years agoMake a11y node info parceling more robust am: 1d8eb49073 am: 93c47c9d07 am: 3a7cf1f05...
Phil Weaver [Sat, 8 Apr 2017 00:09:40 +0000 (00:09 +0000)]
Make a11y node info parceling more robust am: 1d8eb49073 am: 93c47c9d07 am: 3a7cf1f057  -s ours am: d3a4f4a33c am: 384e51767d am: e4beeeb423 am: 8e6d10c65f am: ba05c14397
am: 88bd259e8d

Change-Id: I78596326137bb4fcd01f6f2b9d81787d9ccb9cf9

7 years agoMake a11y node info parceling more robust am: 1d8eb49073 am: 93c47c9d07 am: 3a7cf1f05...
Phil Weaver [Sat, 8 Apr 2017 00:02:10 +0000 (00:02 +0000)]
Make a11y node info parceling more robust am: 1d8eb49073 am: 93c47c9d07 am: 3a7cf1f057  -s ours am: d3a4f4a33c am: 384e51767d am: e4beeeb423 am: 8e6d10c65f
am: ba05c14397

Change-Id: I9b44e3353c2140d074f7eb38342257334330fb6f

7 years agoMerge "Make a11y node info parceling more robust" into lmp-mr1-dev am: 88698afd01...
Phil Weaver [Sat, 8 Apr 2017 00:02:02 +0000 (00:02 +0000)]
Merge "Make a11y node info parceling more robust" into lmp-mr1-dev am: 88698afd01 am: 7cb5e1dfd1 am: d7552dc819 am: e3a1b81c8f
am: 879bdbeb37

Change-Id: I7e7f391e2fe53d60a13b8c96d5ba1cab6e880b48

7 years agoMerge "Make a11y node info parceling more robust" into lmp-mr1-dev am: 88698afd01...
Phil Weaver [Fri, 7 Apr 2017 23:58:02 +0000 (23:58 +0000)]
Merge "Make a11y node info parceling more robust" into lmp-mr1-dev am: 88698afd01 am: 7cb5e1dfd1 am: d7552dc819
am: e3a1b81c8f

Change-Id: I221aecc956ab769246b0aaee7507a468c106c43d

7 years agoMake a11y node info parceling more robust am: 1d8eb49073 am: 93c47c9d07 am: 3a7cf1f05...
Phil Weaver [Fri, 7 Apr 2017 23:54:43 +0000 (23:54 +0000)]
Make a11y node info parceling more robust am: 1d8eb49073 am: 93c47c9d07 am: 3a7cf1f057  -s ours am: d3a4f4a33c am: 384e51767d am: e4beeeb423
am: 8e6d10c65f

Change-Id: I6ce318f51b1a7ead1898c6a6c61d9ca5e48f2fd1

7 years agoMerge "Make a11y node info parceling more robust" into lmp-mr1-dev am: 88698afd01...
Phil Weaver [Fri, 7 Apr 2017 23:51:01 +0000 (23:51 +0000)]
Merge "Make a11y node info parceling more robust" into lmp-mr1-dev am: 88698afd01 am: 7cb5e1dfd1
am: d7552dc819

Change-Id: I926e8b686895d4dcb401e0274b786702a5648307

7 years agoMake a11y node info parceling more robust am: 1d8eb49073 am: 93c47c9d07 am: 3a7cf1f05...
Phil Weaver [Fri, 7 Apr 2017 23:47:07 +0000 (23:47 +0000)]
Make a11y node info parceling more robust am: 1d8eb49073 am: 93c47c9d07 am: 3a7cf1f057  -s ours am: d3a4f4a33c am: 384e51767d
am: e4beeeb423

Change-Id: I6a369b43c54463330d6aa8a2f4ad9b5f5e46e887

7 years agoMerge "Make a11y node info parceling more robust" into lmp-mr1-dev am: 88698afd01
Phil Weaver [Fri, 7 Apr 2017 23:43:28 +0000 (23:43 +0000)]
Merge "Make a11y node info parceling more robust" into lmp-mr1-dev am: 88698afd01
am: 7cb5e1dfd1

Change-Id: I8e51350ae38384dfb9ae034d73fe9087837b27f7

7 years agoMake a11y node info parceling more robust am: 1d8eb49073 am: 93c47c9d07 am: 3a7cf1f05...
Phil Weaver [Fri, 7 Apr 2017 23:43:01 +0000 (23:43 +0000)]
Make a11y node info parceling more robust am: 1d8eb49073 am: 93c47c9d07 am: 3a7cf1f057  -s ours am: d3a4f4a33c
am: 384e51767d

Change-Id: I566fa4ea9d3d15e1a65fbae11d20defb37868dd6

7 years agoMerge "Make a11y node info parceling more robust" into lmp-mr1-dev
Phil Weaver [Fri, 7 Apr 2017 23:36:29 +0000 (23:36 +0000)]
Merge "Make a11y node info parceling more robust" into lmp-mr1-dev
am: 88698afd01

Change-Id: I37194d958aa5fc21ece027c288e2f9a0a239cd93

7 years agoMake a11y node info parceling more robust am: 1d8eb49073 am: 93c47c9d07 am: 3a7cf1f05...
Phil Weaver [Fri, 7 Apr 2017 23:36:29 +0000 (23:36 +0000)]
Make a11y node info parceling more robust am: 1d8eb49073 am: 93c47c9d07 am: 3a7cf1f057  -s ours
am: d3a4f4a33c

Change-Id: I2c1d0fb08ed990e4deb03361dddb1075d1ac7fad

7 years agoMerge "Make a11y node info parceling more robust" into nyc-dev am: ce5c8cb6b8 am...
Phil Weaver [Fri, 7 Apr 2017 23:32:28 +0000 (23:32 +0000)]
Merge "Make a11y node info parceling more robust" into nyc-dev am: ce5c8cb6b8 am: 3241198caa
am: 9ff56373ff

Change-Id: I53855b4dc3bba60226751fdaaaa722636c226486

7 years agoMake a11y node info parceling more robust am: 1d8eb49073 am: 93c47c9d07
Phil Weaver [Fri, 7 Apr 2017 23:30:19 +0000 (23:30 +0000)]
Make a11y node info parceling more robust am: 1d8eb49073 am: 93c47c9d07
am: 3a7cf1f057  -s ours

Change-Id: I0000c6df3ca0375022535be19cf0f9a76ed07e39

7 years agoMerge "Make a11y node info parceling more robust" into lmp-mr1-dev
Phil Weaver [Fri, 7 Apr 2017 23:27:47 +0000 (23:27 +0000)]
Merge "Make a11y node info parceling more robust" into lmp-mr1-dev

7 years agoMerge "Make a11y node info parceling more robust" into nyc-dev am: ce5c8cb6b8
Phil Weaver [Fri, 7 Apr 2017 23:25:03 +0000 (23:25 +0000)]
Merge "Make a11y node info parceling more robust" into nyc-dev am: ce5c8cb6b8
am: 3241198caa

Change-Id: I370bd8804cd24fb3b67160da1e76084abce525cf

7 years agoMake a11y node info parceling more robust am: d0e54c1c09 am: d87b12a4df am: a0f874d5c...
Phil Weaver [Fri, 7 Apr 2017 23:24:59 +0000 (23:24 +0000)]
Make a11y node info parceling more robust am: d0e54c1c09 am: d87b12a4df am: a0f874d5c1 am: c30868369c am: 4c898e40ef am: b35d6eadf3
am: 576768a022

Change-Id: If36bfc0a6ec317b6d46a0de7fe24a8be38ef59c7

7 years agoMake a11y node info parceling more robust am: d0e54c1c09 am: d87b12a4df am: a0f874d5c...
Phil Weaver [Fri, 7 Apr 2017 23:17:08 +0000 (23:17 +0000)]
Make a11y node info parceling more robust am: d0e54c1c09 am: d87b12a4df am: a0f874d5c1 am: c30868369c am: 4c898e40ef
am: b35d6eadf3

Change-Id: I460b2e5df5cc1946eec4e9366e22c5de188642c9

7 years agoMerge "Make a11y node info parceling more robust" into nyc-dev
Phil Weaver [Fri, 7 Apr 2017 23:17:02 +0000 (23:17 +0000)]
Merge "Make a11y node info parceling more robust" into nyc-dev
am: ce5c8cb6b8

Change-Id: I6cd7aa39d267bbecbbed54f564dc90b520fe5773

7 years agoMake a11y node info parceling more robust am: 1d8eb49073
Phil Weaver [Fri, 7 Apr 2017 23:16:55 +0000 (23:16 +0000)]
Make a11y node info parceling more robust am: 1d8eb49073
am: 93c47c9d07

Change-Id: I8677c77968c202c8c6a0553db919610a140fda58

7 years agoMerge "Make a11y node info parceling more robust" into nyc-dev
Phil Weaver [Fri, 7 Apr 2017 23:10:27 +0000 (23:10 +0000)]
Merge "Make a11y node info parceling more robust" into nyc-dev

7 years agoMake a11y node info parceling more robust am: d0e54c1c09 am: d87b12a4df am: a0f874d5c...
Phil Weaver [Fri, 7 Apr 2017 23:09:35 +0000 (23:09 +0000)]
Make a11y node info parceling more robust am: d0e54c1c09 am: d87b12a4df am: a0f874d5c1 am: c30868369c
am: 4c898e40ef

Change-Id: Icdb456c12bf0e0d3675ab15fa0b82b482ff4ddeb

7 years agoMake a11y node info parceling more robust
Phil Weaver [Fri, 7 Apr 2017 23:09:28 +0000 (23:09 +0000)]
Make a11y node info parceling more robust
am: 1d8eb49073

Change-Id: I5280a23cbfff5abfcc83e9e6d9afb4f8960ece44

7 years agoMake a11y node info parceling more robust am: d0e54c1c09 am: d87b12a4df am: a0f874d5c1
Phil Weaver [Fri, 7 Apr 2017 23:02:10 +0000 (23:02 +0000)]
Make a11y node info parceling more robust am: d0e54c1c09 am: d87b12a4df am: a0f874d5c1
am: c30868369c

Change-Id: If1cfc920db5aea27397a8f79125db944d5c4580b

7 years agoMake a11y node info parceling more robust am: d0e54c1c09 am: d87b12a4df
Phil Weaver [Fri, 7 Apr 2017 22:53:58 +0000 (22:53 +0000)]
Make a11y node info parceling more robust am: d0e54c1c09 am: d87b12a4df
am: a0f874d5c1

Change-Id: I2bc5c091c1c685da2be951e4294483519481789f

7 years agoMake a11y node info parceling more robust am: d0e54c1c09
Phil Weaver [Fri, 7 Apr 2017 22:46:31 +0000 (22:46 +0000)]
Make a11y node info parceling more robust am: d0e54c1c09
am: d87b12a4df

Change-Id: Ic10324338024f86cfc64b3e01c6380b26334d5a3

7 years agoMake a11y node info parceling more robust
Phil Weaver [Fri, 7 Apr 2017 22:39:22 +0000 (22:39 +0000)]
Make a11y node info parceling more robust
am: d0e54c1c09

Change-Id: Ie4c34b84540bc928859ef1c271b4eb9d520fa6bc