OSDN Git Service
Adam Powell [Mon, 2 May 2016 21:26:29 +0000 (21:26 +0000)]
Backport ChooserTarget package source check from N am:
82b9565bd1 am:
6d5f80d13b
am:
7ac638702d
* commit '
7ac638702de3b8af0a02db764adb95f2d10d1524':
Backport ChooserTarget package source check from N
Change-Id: I9d936089af04cc32a54245d91c17a23569c5fd1c
Adam Powell [Mon, 2 May 2016 21:21:11 +0000 (21:21 +0000)]
Backport ChooserTarget package source check from N am:
82b9565bd1
am:
6d5f80d13b
* commit '
6d5f80d13b06d439db08fcd5d25490edb322f923':
Backport ChooserTarget package source check from N
Change-Id: Iec7902498e2cfe53ce16dc9faf2d91340f416799
Adam Powell [Mon, 2 May 2016 21:15:05 +0000 (21:15 +0000)]
Backport ChooserTarget package source check from N
am:
82b9565bd1
* commit '
82b9565bd13e2c5dac20b3221b7be28c5afe57ea':
Backport ChooserTarget package source check from N
Change-Id: Ic7e4a8e80829ccb0b2f60c572eea15d18d6658ec
Adam Powell [Thu, 28 Apr 2016 23:32:18 +0000 (16:32 -0700)]
Backport ChooserTarget package source check from N
Fix a bug where a ChooserTargetService could supply a ChooserTarget
pointing at a non-exported activity outside of its own package and
have it launch.
Bug
28384423
Change-Id: I3f5854f91c5695ad9253d71055ef58224df47008
Christopher Tate [Wed, 20 Apr 2016 21:48:43 +0000 (21:48 +0000)]
resolve merge conflicts of
44e07e0 to mnc-dev am:
825b713 am:
8c635e7
am:
343600c
* commit '
343600c3ecff31826e50d40821927e446adb9b0a':
Kill the real/isolated uid group, not the ApplicationInfo uid
Change-Id: I68dbf8f280672ec9770b6c57b9a17313f448e14a
Christopher Tate [Wed, 20 Apr 2016 21:43:17 +0000 (21:43 +0000)]
resolve merge conflicts of
44e07e0 to mnc-dev am:
825b713
am:
8c635e7
* commit '
8c635e73c698302ce6661f227c274164972f048e':
Kill the real/isolated uid group, not the ApplicationInfo uid
Change-Id: Iae6fe5af0a8e0f27e8b45a56aecc2d722d7c3bc3
Christopher Tate [Wed, 20 Apr 2016 21:35:50 +0000 (21:35 +0000)]
resolve merge conflicts of
44e07e0 to mnc-dev
am:
825b713
* commit '
825b7134699fbaaa16423c52b7b424d4a9afefb1':
Kill the real/isolated uid group, not the ApplicationInfo uid
Change-Id: I0c120c8dbf76857985ebea04eadca81fa6470cb2
Christopher Tate [Wed, 20 Apr 2016 20:33:41 +0000 (13:33 -0700)]
resolve merge conflicts of
44e07e0 to mnc-dev
Change-Id: Ibc446c82a3d1446ccd81630743f82d1fd58fbd47
Mitchell Wills [Wed, 20 Apr 2016 18:57:29 +0000 (18:57 +0000)]
Update scan and last network info in the WorkThread am:
cf0875a
am:
c441faa
* commit '
c441faa6de5618e9da029858ce83b3e129be2974':
Update scan and last network info in the WorkThread
Change-Id: I69ee081eb91a521e7c6cdc7ca6e96ebc230c1aba
Mitchell Wills [Wed, 20 Apr 2016 18:53:58 +0000 (18:53 +0000)]
Update scan and last network info in the WorkThread
am:
cf0875a
* commit '
cf0875a9b69da9da5e16563eca33609e775d9195':
Update scan and last network info in the WorkThread
Change-Id: I0b59f1eaa9bad27b300477f31fb88fb8e2eacb38
Christopher Tate [Wed, 20 Apr 2016 18:37:20 +0000 (11:37 -0700)]
resolve merge conflicts of
5e380f0 to lmp-mr1-ub-dev
Change-Id: Ie8d3c154f4c98bb1c2a1954ff1dabc8f5bc20b71
Mitchell Wills [Mon, 18 Apr 2016 21:54:53 +0000 (14:54 -0700)]
Update scan and last network info in the WorkThread
This prevents a race condition where mLastInfo is updated while
processing scan results causing a crash.
Change-Id: Ic5147f3851f218c0f697e4ebb324f1cb63d02665
Fixes:
27944510
Christopher Tate [Wed, 20 Apr 2016 00:05:54 +0000 (00:05 +0000)]
resolve merge conflicts of
7641889 to lmp-mr1-dev
am:
cebcde3b5a
* commit '
cebcde3b5a1e406d953629d5b4c87347921a17de':
Kill the real/isolated uid group, not the ApplicationInfo uid
Change-Id: I6e3c41c59dfe4105780ad7d6d20f9096aabd575a
Christopher Tate [Tue, 19 Apr 2016 22:51:37 +0000 (15:51 -0700)]
resolve merge conflicts of
7641889 to lmp-mr1-dev
Change-Id: Ie162907d7388d0e388ab39bcf2471d19e2ce7020
Christopher Tate [Mon, 18 Apr 2016 22:16:31 +0000 (15:16 -0700)]
Kill the real/isolated uid group, not the ApplicationInfo uid
This is a direct reimplementation in L of fixes applied to N in
these two commits:
8dc8d37c1d7d694016f1ec2b3cea5fb723567be8
e8741d23d2dd05c4cb3fed5ee6a4040ee96a60e3
Bug
19285814
Change-Id: I59bcc8f1d41c426e9da635bea9ad1d7c6756d5aa
Michael Wright [Mon, 18 Apr 2016 18:57:54 +0000 (18:57 +0000)]
Merge "Add new, hidden MotionEvent flag for partially obscured windows." into mnc-dev am:
224582e am:
c6629bd
am:
a8064c2
* commit '
a8064c2a8b54881bceade03a9d2f6c1223e055f3':
Add new, hidden MotionEvent flag for partially obscured windows.
Change-Id: I4e8d2bff82a3308c5966a0b0c154209b727db669
Michael Wright [Mon, 18 Apr 2016 18:52:13 +0000 (18:52 +0000)]
Merge "Add new, hidden MotionEvent flag for partially obscured windows." into mnc-dev am:
224582e
am:
c6629bd
* commit '
c6629bd5dff622a26683269f9201b8d7871c6ef1':
Add new, hidden MotionEvent flag for partially obscured windows.
Change-Id: I0d602765de707548ede0b1c0a6a38790626e7da1
Michael Wright [Mon, 18 Apr 2016 18:46:44 +0000 (18:46 +0000)]
Merge "Add new, hidden MotionEvent flag for partially obscured windows." into mnc-dev
am:
224582e
* commit '
224582e0403bb123da49d80af21f108900185769':
Add new, hidden MotionEvent flag for partially obscured windows.
Change-Id: I24f2bf328c91bbc05f1b76ed464d962c71e92245
Michael Wright [Mon, 18 Apr 2016 18:40:17 +0000 (18:40 +0000)]
Merge "Add new, hidden MotionEvent flag for partially obscured windows." into mnc-dev
Todd Kennedy [Mon, 11 Apr 2016 22:49:30 +0000 (22:49 +0000)]
DO NOT MERGE Fix intent filter priorities am:
60351d3 am:
3dfc6d9 am:
ca13384 -s ours am:
c2cc804 -s ours am:
620a4ed am:
be58fe0 am:
e265f35 -s ours am:
3bdb89b am:
b757575
am:
d359c8a
* commit '
d359c8a26d389938d972e1febdd275c6e19f6ab7':
DO NOT MERGE Fix intent filter priorities
Change-Id: Ibcaf0d28db2f332885b4ec9f8ee782e579f1b2b3
Todd Kennedy [Mon, 11 Apr 2016 22:44:03 +0000 (22:44 +0000)]
DO NOT MERGE Fix intent filter priorities am:
60351d3 am:
3dfc6d9 am:
ca13384 -s ours am:
c2cc804 -s ours am:
620a4ed am:
be58fe0 am:
e265f35 -s ours am:
3bdb89b
am:
b757575
* commit '
b7575756c45c28ebc116165e4e51d7ccaea40f47':
DO NOT MERGE Fix intent filter priorities
Change-Id: Iee51ca7b69c8b7f45083b4dc1f657b8773f65595
Todd Kennedy [Mon, 11 Apr 2016 22:37:51 +0000 (22:37 +0000)]
DO NOT MERGE Fix intent filter priorities am:
60351d3 am:
3dfc6d9 am:
ca13384 -s ours am:
c2cc804 -s ours am:
620a4ed am:
be58fe0 am:
e265f35 -s ours
am:
3bdb89b
* commit '
3bdb89bd1c6fa2656061efd095cb794619d0ab06':
DO NOT MERGE Fix intent filter priorities
Change-Id: Id1a5e903e838b9118cc4bbd37879b5e840f8b3b6
Todd Kennedy [Mon, 11 Apr 2016 22:32:47 +0000 (22:32 +0000)]
DO NOT MERGE Fix intent filter priorities am:
60351d3 am:
3dfc6d9 am:
ca13384 -s ours am:
c2cc804 -s ours am:
620a4ed am:
be58fe0
am:
e265f35 -s ours
* commit '
e265f35caa276035535f7546f01a91b4e072de0c':
DO NOT MERGE Fix intent filter priorities
Change-Id: Ide1b16d642573c37bced4d293d91bf043bb0a78d
Todd Kennedy [Mon, 11 Apr 2016 22:32:43 +0000 (22:32 +0000)]
DO NOT MERGE Fix intent filter priorities am:
d6174e7 -s ours am:
ebb136c am:
6e0aff3 am:
a73fa08 -s ours am:
d73c865 am:
e0481f0
am:
e5116c2
* commit '
e5116c291039dbdfc028a212b02518d0c49b417b':
DO NOT MERGE Fix intent filter priorities
Change-Id: I7a48dd50d17e12343a6c79ba33739f727f29aae2
Todd Kennedy [Mon, 11 Apr 2016 22:27:50 +0000 (22:27 +0000)]
DO NOT MERGE Fix intent filter priorities am:
60351d3 am:
3dfc6d9 am:
ca13384 -s ours am:
c2cc804 -s ours am:
620a4ed
am:
be58fe0
* commit '
be58fe035e8a852c903c3c1c397eaa980670d8f9':
DO NOT MERGE Fix intent filter priorities
Change-Id: I7cd88d627c03199ee8252862c73f88d0b6507dd9
Todd Kennedy [Mon, 11 Apr 2016 22:27:46 +0000 (22:27 +0000)]
DO NOT MERGE Fix intent filter priorities am:
d6174e7 -s ours am:
ebb136c am:
6e0aff3 am:
a73fa08 -s ours am:
d73c865
am:
e0481f0
* commit '
e0481f0ee6321bd049ead42964dc7b4ecaf98754':
DO NOT MERGE Fix intent filter priorities
Change-Id: I8e1c54619278c261d952d6ed297a6a0f74b2724c
Todd Kennedy [Mon, 11 Apr 2016 22:22:35 +0000 (22:22 +0000)]
DO NOT MERGE Fix intent filter priorities am:
60351d3 am:
3dfc6d9 am:
ca13384 -s ours am:
c2cc804 -s ours
am:
620a4ed
* commit '
620a4ed031d807c6945d531d1a98374eba369449':
DO NOT MERGE Fix intent filter priorities
Change-Id: I33b683fabecb18a08e10bfd68b9c3ec6abe35f0f
Todd Kennedy [Mon, 11 Apr 2016 22:22:30 +0000 (22:22 +0000)]
DO NOT MERGE Fix intent filter priorities am:
d6174e7 -s ours am:
ebb136c am:
6e0aff3 am:
a73fa08 -s ours
am:
d73c865
* commit '
d73c865385e2177055962d1015530c48556fd9f8':
DO NOT MERGE Fix intent filter priorities
Change-Id: Ied6935ae9e523f7f824b45ab3057cab1717296d6
Todd Kennedy [Mon, 11 Apr 2016 22:17:20 +0000 (22:17 +0000)]
DO NOT MERGE Fix intent filter priorities am:
60351d3 am:
3dfc6d9 am:
ca13384 -s ours
am:
c2cc804 -s ours
* commit '
c2cc804407212d3431419cded89de1fd6269eaa2':
DO NOT MERGE Fix intent filter priorities
Change-Id: I60eb783f06f0eb0c09c21ea6ec0fc10340ff63c6
Todd Kennedy [Mon, 11 Apr 2016 22:17:19 +0000 (22:17 +0000)]
DO NOT MERGE Fix intent filter priorities am:
d6174e7 -s ours am:
ebb136c am:
6e0aff3
am:
a73fa08 -s ours
* commit '
a73fa08457827b17a3db15ccaf52cb65a693d5db':
DO NOT MERGE Fix intent filter priorities
Change-Id: Ie5c2a26cf1c6cc8f363845fb1be187fffc1a88fe
Todd Kennedy [Mon, 11 Apr 2016 22:12:19 +0000 (22:12 +0000)]
DO NOT MERGE Fix intent filter priorities am:
60351d3 am:
3dfc6d9
am:
ca13384 -s ours
* commit '
ca133845ef815d7cc1f036b1355130a8a867a98c':
DO NOT MERGE Fix intent filter priorities
Change-Id: I88811d2bce66e53998360909612003873e9407af
Todd Kennedy [Mon, 11 Apr 2016 22:12:09 +0000 (22:12 +0000)]
DO NOT MERGE Fix intent filter priorities am:
d6174e7 -s ours am:
ebb136c
am:
6e0aff3
* commit '
6e0aff30cfe571c117a8f20b15c3b27f3aecc7fa':
DO NOT MERGE Fix intent filter priorities
Change-Id: Icc23a9c2a4dafad3ecbf91e27647318c33b39d6a
Todd Kennedy [Mon, 11 Apr 2016 22:12:05 +0000 (22:12 +0000)]
DO NOT MERGE Fix intent filter priorities am:
eeb970a am:
cd24c4e
am:
bd770bc
* commit '
bd770bc97b7c4745c39d16ca417bd8ddedcaefcf':
DO NOT MERGE Fix intent filter priorities
Change-Id: I7c17baf18e2d25c95fb5b8fa45f5cc7b5936723b
Todd Kennedy [Mon, 11 Apr 2016 22:06:38 +0000 (22:06 +0000)]
DO NOT MERGE Fix intent filter priorities am:
60351d3
am:
3dfc6d9
* commit '
3dfc6d986f6142b1e0020c9970f626c7c435711e':
DO NOT MERGE Fix intent filter priorities
Change-Id: Id396cca79db8f830a513746f387fb866c773c778
Todd Kennedy [Mon, 11 Apr 2016 22:06:35 +0000 (22:06 +0000)]
DO NOT MERGE Fix intent filter priorities am:
eeb970a
am:
cd24c4e
* commit '
cd24c4ebc0904342b5c9657c43dfa6c07c6e1eec':
DO NOT MERGE Fix intent filter priorities
Change-Id: Idc3d639cd5494210f06f46b644f465be26eca9b1
Todd Kennedy [Mon, 11 Apr 2016 22:06:35 +0000 (22:06 +0000)]
DO NOT MERGE Fix intent filter priorities am:
d6174e7 -s ours
am:
ebb136c
* commit '
ebb136cbda0ba1caff3c482e00aff416edc5117f':
DO NOT MERGE Fix intent filter priorities
Change-Id: I20536d7bca605aadb8cec8bee5383e1aef9742c9
Todd Kennedy [Mon, 11 Apr 2016 22:00:31 +0000 (22:00 +0000)]
DO NOT MERGE Fix intent filter priorities
am:
d6174e7 -s ours
* commit '
d6174e74020aaec97db5780837a3edcd787018bf':
DO NOT MERGE Fix intent filter priorities
Change-Id: I9d089bfaf20baee25c1999d24020956dcbc2509e
Todd Kennedy [Mon, 11 Apr 2016 22:00:27 +0000 (22:00 +0000)]
DO NOT MERGE Fix intent filter priorities
am:
60351d3
* commit '
60351d3be29977dfe0b422de797a0429edf500b7':
DO NOT MERGE Fix intent filter priorities
Change-Id: Ieca2ee83f22e5d4083f895f52d42a2f697920be7
Todd Kennedy [Mon, 11 Apr 2016 22:00:26 +0000 (22:00 +0000)]
DO NOT MERGE Fix intent filter priorities
am:
eeb970a
* commit '
eeb970ada10d37495ad7a8a4b14ad0506b640eea':
DO NOT MERGE Fix intent filter priorities
Change-Id: I22cfcc61e9ec37242e0e47ef732c9364bdb8a886
Todd Kennedy [Mon, 4 Apr 2016 19:29:59 +0000 (12:29 -0700)]
DO NOT MERGE Fix intent filter priorities
Since this is a backport, there is only one rule that guards intent
filter priorities:
1) Updates will NOT be granted a priority greater than the priority
defined on the system image.
NOTE: I had to bring in pieces of ag/526831 so intent filters could
be collected and matched
Bug:
27450489
Change-Id: Ifcec4d7a59e684331399abc41eea1bd6876155a4
Todd Kennedy [Mon, 4 Apr 2016 19:29:59 +0000 (12:29 -0700)]
DO NOT MERGE Fix intent filter priorities
Since this is a backport, there is only one rule that guards intent
filter priorities:
1) Updates will NOT be granted a priority greater than the priority
defined on the system image.
Bug:
27450489
Change-Id: Ifcec4d7a59e684331399abc41eea1bd6876155a4
Todd Kennedy [Mon, 4 Apr 2016 19:29:59 +0000 (12:29 -0700)]
DO NOT MERGE Fix intent filter priorities
Since this is a backport, there is only one rule that guards intent
filter priorities:
1) Updates will NOT be granted a priority greater than the priority
defined on the system image.
Bug:
27450489
Change-Id: Ifcec4d7a59e684331399abc41eea1bd6876155a4
Michael Wright [Thu, 31 Mar 2016 00:31:48 +0000 (17:31 -0700)]
Add new, hidden MotionEvent flag for partially obscured windows.
Bug:
26677796
Change-Id: Ic4219b883bb760495e6172ef61e84e9725876ef6
Sharvil Nanavati [Fri, 25 Mar 2016 20:18:05 +0000 (20:18 +0000)]
Merge "DO NOT MERGE ANYWHERE Add a NetworkTemplate matcher for ConnectivityManager#TYPE_PROXY." into cw-e-dev
am:
a677ea7 -s ours
* commit '
a677ea72b159317ebb7456f60703babacef61650':
DO NOT MERGE ANYWHERE Add a NetworkTemplate matcher for ConnectivityManager#TYPE_PROXY.
Sharvil Nanavati [Fri, 25 Mar 2016 20:14:28 +0000 (20:14 +0000)]
Merge "DO NOT MERGE ANYWHERE Add a NetworkTemplate matcher for ConnectivityManager#TYPE_PROXY." into cw-e-dev
Andriy Naborskyy [Thu, 24 Mar 2016 22:43:04 +0000 (22:43 +0000)]
Merge "bootanimation: implement split packaging of animation" into cw-e-dev
am:
9f68357
* commit '
9f68357d5f71c263f2ff67736a0d2272cc840c32':
bootanimation: implement split packaging of animation
Andriy Naborskyy [Thu, 24 Mar 2016 22:03:19 +0000 (22:03 +0000)]
Merge "bootanimation: implement split packaging of animation" into cw-e-dev
Sharvil Nanavati [Mon, 21 Mar 2016 21:19:37 +0000 (14:19 -0700)]
DO NOT MERGE ANYWHERE Add a NetworkTemplate matcher for ConnectivityManager#TYPE_PROXY.
Change-Id: I48c0a7bc39e2efcc5b4120a4fa2ecf6dfd54ac27
Samuel Tan [Wed, 23 Mar 2016 22:05:50 +0000 (22:05 +0000)]
[DO NOT MERGE] Disallow guest user from changing Wifi settings am:
d385a6d -s ours am:
c2712ab am:
3253022 am:
f4fd201 -s ours am:
1450b69 am:
1d508de
am:
3b2ed11
* commit '
3b2ed11851f342f01bef3832e8603122698a3588':
[DO NOT MERGE] Disallow guest user from changing Wifi settings
Samuel Tan [Wed, 23 Mar 2016 21:58:28 +0000 (21:58 +0000)]
[DO NOT MERGE] Disallow guest user from changing Wifi settings am:
d385a6d -s ours am:
c2712ab am:
3253022 am:
f4fd201 -s ours am:
1450b69
am:
1d508de
* commit '
1d508decacf84e26db6164d30006166e0fc74f5f':
[DO NOT MERGE] Disallow guest user from changing Wifi settings
Samuel Tan [Wed, 23 Mar 2016 21:53:57 +0000 (21:53 +0000)]
[DO NOT MERGE] Disallow guest user from changing Wifi settings am:
d385a6d -s ours am:
c2712ab am:
3253022 am:
f4fd201 -s ours
am:
1450b69
* commit '
1450b69182fd9b360d9dd4ec54d431560eb775e6':
[DO NOT MERGE] Disallow guest user from changing Wifi settings
Samuel Tan [Wed, 23 Mar 2016 21:49:16 +0000 (21:49 +0000)]
[DO NOT MERGE] Disallow guest user from changing Wifi settings am:
d385a6d -s ours am:
c2712ab am:
3253022
am:
f4fd201 -s ours
* commit '
f4fd20168fdf1ee19da63cc82c0893a288d8b759':
[DO NOT MERGE] Disallow guest user from changing Wifi settings
Samuel Tan [Wed, 23 Mar 2016 21:45:25 +0000 (21:45 +0000)]
[DO NOT MERGE] Disallow guest user from changing Wifi settings am:
d385a6d -s ours am:
c2712ab
am:
3253022
* commit '
325302206a0129bdf16a486232d5864d71e62a44':
[DO NOT MERGE] Disallow guest user from changing Wifi settings
Samuel Tan [Wed, 23 Mar 2016 21:45:23 +0000 (21:45 +0000)]
[DO NOT MERGE] Disallow guest user from changing Wifi settings am:
d8c3ca4 am:
542bb73
am:
fbfd7d0
* commit '
fbfd7d0c91ef84d12ca036462b54794076d06cdc':
[DO NOT MERGE] Disallow guest user from changing Wifi settings
Samuel Tan [Wed, 23 Mar 2016 21:40:45 +0000 (21:40 +0000)]
[DO NOT MERGE] Disallow guest user from changing Wifi settings am:
d385a6d -s ours
am:
c2712ab
* commit '
c2712ab7bd3bdeaf8945bc80154f402e1cf727bc':
[DO NOT MERGE] Disallow guest user from changing Wifi settings
Samuel Tan [Wed, 23 Mar 2016 21:40:23 +0000 (21:40 +0000)]
[DO NOT MERGE] Disallow guest user from changing Wifi settings am:
d8c3ca4
am:
542bb73
* commit '
542bb7307b2bf3dab337b56e392b778896f88ec6':
[DO NOT MERGE] Disallow guest user from changing Wifi settings
Samuel Tan [Wed, 23 Mar 2016 21:35:32 +0000 (21:35 +0000)]
[DO NOT MERGE] Disallow guest user from changing Wifi settings
am:
d385a6d -s ours
* commit '
d385a6d95fc830ecc8d55937e9f46b14165d4b34':
[DO NOT MERGE] Disallow guest user from changing Wifi settings
Samuel Tan [Wed, 23 Mar 2016 21:35:30 +0000 (21:35 +0000)]
[DO NOT MERGE] Disallow guest user from changing Wifi settings
am:
d8c3ca4
* commit '
d8c3ca43163427a75c8b70114096238177f97af0':
[DO NOT MERGE] Disallow guest user from changing Wifi settings
Andriy Naborskyy [Mon, 17 Aug 2015 04:32:50 +0000 (21:32 -0700)]
bootanimation: implement split packaging of animation
Animation package zip can be separated into OEM and SYSTEM
OEM desc.txt can use new command "$SYSTEM" to invoke animation
from SYSTEM package
Changes to animation structure:
1. animation can refer other animation
2. animation contains zip file reference
3. BootAnimation has name of root of animation Zip; processing desc.txt we
need filename of container zip and we can't access it from ZipFileRO instance
movie() changes:
1. Split movie() into loading Zip and playing part
2. load parses desc.txt and if needed referred Zip
3. play can descend animations tree
Change-Id: I600d02c84d537df7b3e32a84f84a294b26e319e0
Signed-off-by: Andriy Naborskyy <andriyn@google.com>
Samuel Tan [Mon, 14 Mar 2016 22:57:02 +0000 (15:57 -0700)]
[DO NOT MERGE] Disallow guest user from changing Wifi settings
Disallow existing and newly created guest users from
changing Wifi settings.
BUG:
27411179
TEST: Flashed device, switched to existing guest user, and verified
that Wifi settings are disabled.
TEST: Flashed device, created new guest user, and verified that Wifi
settings are disabled.
Change-Id: Ia1bf4cce0369017b62f69d317c7ab2e30e3949b3
Samuel Tan [Mon, 14 Mar 2016 22:57:02 +0000 (15:57 -0700)]
[DO NOT MERGE] Disallow guest user from changing Wifi settings
Disallow existing and newly created guest users from
changing Wifi settings.
BUG:
27411179
TEST: Flashed device, switched to existing guest user, and verified
that Wifi settings are disabled.
TEST: Flashed device, created new guest user, and verified that Wifi
settings are disabled.
Change-Id: Ia1bf4cce0369017b62f69d317c7ab2e30e3949b3
Tyler Gunn [Fri, 18 Mar 2016 01:34:27 +0000 (18:34 -0700)]
DO NOT MERGE Add new ConnectionEvent API (hide) to send a notification to Telecom
Connection event used to inform Telecom that it should play or stop
the on hold tone. This is used to play or stop a tone when the peer
puts the current call on hold.
BUG=
25357778
Change-Id: I2669f8f5062449784a712b9dd28e576326fcc679
Pierre-Laurent Coirier [Wed, 2 Mar 2016 18:53:21 +0000 (18:53 +0000)]
Merge "Grant fixed SMS & Phone permission to package handling the twinning settings intent." into cw-e-dev
am:
54c3808802
* commit '
54c3808802e643785cc76b29067d1119e9c78af4':
Grant fixed SMS & Phone permission to package handling the twinning settings intent.
Pierre-Laurent Coirier [Wed, 2 Mar 2016 13:04:25 +0000 (13:04 +0000)]
Merge "Grant fixed SMS & Phone permission to package handling the twinning settings intent." into cw-e-dev
Bryce Lee [Wed, 2 Mar 2016 03:12:09 +0000 (03:12 +0000)]
DO NOT MERGE ANYWHERE Add way to query for supported Bluetooth profiles.
am:
7c2539e2a5 -s ours
* commit '
7c2539e2a50ec3dcdb1c9420f9215bba438b21b6':
DO NOT MERGE ANYWHERE Add way to query for supported Bluetooth profiles.
Bryce Lee [Mon, 29 Feb 2016 22:59:07 +0000 (14:59 -0800)]
DO NOT MERGE ANYWHERE Add way to query for supported Bluetooth profiles.
Currently there is no way to get the profiles supported by the Bluetooth
adapter. Asking for a profile proxy of an unsupported profile does not
fail and can lead to code indefinitely waiting for the proxy response. This
new code will allow for checking the supported profiles before asking for
the proxies.
Bug:
26451648
Change-Id: Ie209f08058205eea39513c03b626788f5fed3293
Signed-off-by: Bryce Lee <brycelee@google.com>
Pierre-Laurent Coirier [Fri, 26 Feb 2016 17:07:41 +0000 (12:07 -0500)]
Grant fixed SMS & Phone permission to package handling the twinning
settings intent.
BUG:
27343350
Change-Id: I818424e94006910dc25bab7cccb24f7979c39c9e
Joshua Schwarz [Thu, 25 Feb 2016 22:48:02 +0000 (22:48 +0000)]
Merge "Add Google Now intent so that it is discoverable to AppLaunch metrics." into cw-e-dev
am:
dcd0b05dc3
* commit '
dcd0b05dc35fb058f89a16d370bb7965b339c1c5':
Add Google Now intent so that it is discoverable to AppLaunch metrics.
Joshua Schwarz [Thu, 25 Feb 2016 22:45:20 +0000 (22:45 +0000)]
Merge "Add Google Now intent so that it is discoverable to AppLaunch metrics." into cw-e-dev
Joshua Schwarz [Wed, 24 Feb 2016 01:26:25 +0000 (17:26 -0800)]
Add Google Now intent so that it is discoverable to AppLaunch metrics.
Change-Id: I65ddce1499c3fa2ca54b815709270610a273e571
Andre Eisenbach [Wed, 24 Feb 2016 19:57:07 +0000 (19:57 +0000)]
resolve merge conflicts of
e6c7c8e8f2 to cw-e-dev
am:
dfd4b8b25c
* commit '
dfd4b8b25c6454dec6d1bdc7cae4976b537fff2f':
DO NOT MERGE Read Bluetooth interop database entries from settings (1/2)
Andre Eisenbach [Wed, 24 Feb 2016 19:36:27 +0000 (11:36 -0800)]
resolve merge conflicts of
e6c7c8e8f2 to cw-e-dev
Change-Id: I94683e571a73df721206d7e5fc14cb817ec9620f
Andre Eisenbach [Wed, 24 Feb 2016 18:35:37 +0000 (18:35 +0000)]
Merge "DO NOT MERGE Read Bluetooth interop database entries from settings (1/2)" into mnc-dr-dev
Liejun Tao [Tue, 23 Feb 2016 22:00:37 +0000 (22:00 +0000)]
DO NOT MERGE Bluetooth: Restrict gain for Absolute volume case am:
9ef7634fa9
am:
d46bd91531
* commit '
d46bd9153144f905138e0b609c3d8252a5d5505e':
DO NOT MERGE Bluetooth: Restrict gain for Absolute volume case
Liejun Tao [Tue, 23 Feb 2016 21:54:00 +0000 (21:54 +0000)]
DO NOT MERGE Bluetooth: Restrict gain for Absolute volume case
am:
9ef7634fa9
* commit '
9ef7634fa9b4e9cf9ea9380aee8b7dfd71f24b57':
DO NOT MERGE Bluetooth: Restrict gain for Absolute volume case
Andre Eisenbach [Thu, 14 Jan 2016 22:20:34 +0000 (14:20 -0800)]
DO NOT MERGE Read Bluetooth interop database entries from settings (1/2)
Interop database entries are stored in the system settings entry
"BluetoothInteropDatabase". The format is a list of entries separated by
";". An entry consists of a BDA fragment, followed by a comma and an
integer representing a feature from interop.h.
Example:
To disable LE secure connections for devices starting with BDA 11:22:33,
use "11:22:33,0".
Bug:
26548845
Change-Id: I6a9fd34f6af4d3bdfcaa0e051eafebdfbf2a4949
(cherry picked from commit
3bc623be8dd8b83d0a22c5cc5b5a8955001f6fc7)
Liejun Tao [Wed, 20 Jan 2016 23:52:20 +0000 (17:52 -0600)]
DO NOT MERGE Bluetooth: Restrict gain for Absolute volume case
For the lowest music volume steps 1 and 2, restrict the gain to 50% and
75%. This will avoid the lowest volume steps being too loud for some
accessories. For music volume 0, set phone gain to 0 as some
accessories won't mute on their end.
Change-Id: I24e0fa7be8c8635b428a11c91ea153aad7cec55f
Signed-off-by: Liejun Tao <baibai@motorola.com>
Akshay Thakker [Mon, 22 Feb 2016 22:46:59 +0000 (22:46 +0000)]
Merge "DO NOT MERGE Fix for syncs being dropped when appIdle is on" into mnc-dr-dev am:
e210c99809
am:
768e1df375
* commit '
768e1df37559c580ede46574bb1c583b0705375a':
DO NOT MERGE Fix for syncs being dropped when appIdle is on
Akshay Thakker [Mon, 22 Feb 2016 22:39:53 +0000 (22:39 +0000)]
Merge "DO NOT MERGE Fix for syncs being dropped when appIdle is on" into mnc-dr-dev
am:
e210c99809
* commit '
e210c9980946b440bc6f7d57fef18c7fac223d3a':
DO NOT MERGE Fix for syncs being dropped when appIdle is on
Akshay Thakker [Mon, 22 Feb 2016 22:27:24 +0000 (22:27 +0000)]
Merge "DO NOT MERGE Fix for syncs being dropped when appIdle is on" into mnc-dr-dev
Adam Lesinski [Mon, 22 Feb 2016 19:44:19 +0000 (19:44 +0000)]
Merge "DO NOT MERGE ANYWHERE: Hack to get devices booting again." into mnc-dr-dev am:
d201f48687 -s ours
am:
ab4d629294 -s ours
* commit '
ab4d62929412556b90f8927fb05602d2e630518c':
DO NOT MERGE ANYWHERE: Hack to get devices booting again.
Adam Lesinski [Mon, 22 Feb 2016 19:42:04 +0000 (19:42 +0000)]
Merge "DO NOT MERGE ANYWHERE: Don\'t change screen on time on time changes" into mnc-dr-dev am:
3e439db8c8 -s ours
am:
83fd156e21 -s ours
* commit '
83fd156e2173ff65fd8afdaca1ccd20fc91a5d33':
DO NOT MERGE ANYWHERE: Don't change screen on time on time changes
Adam Lesinski [Mon, 22 Feb 2016 19:31:32 +0000 (19:31 +0000)]
Merge "DO NOT MERGE ANYWHERE: Hack to get devices booting again." into mnc-dr-dev
am:
d201f48687 -s ours
* commit '
d201f486871e825e713ae0df2f2f01e3dfff94d8':
DO NOT MERGE ANYWHERE: Hack to get devices booting again.
Adam Lesinski [Mon, 22 Feb 2016 19:27:18 +0000 (19:27 +0000)]
Merge "DO NOT MERGE ANYWHERE: Don\'t change screen on time on time changes" into mnc-dr-dev
am:
3e439db8c8 -s ours
* commit '
3e439db8c829023645a54eee4cd531928bccb03d':
DO NOT MERGE ANYWHERE: Don't change screen on time on time changes
Adam Lesinski [Mon, 22 Feb 2016 18:47:11 +0000 (18:47 +0000)]
Merge "DO NOT MERGE ANYWHERE: Hack to get devices booting again." into mnc-dr-dev
Adam Lesinski [Mon, 22 Feb 2016 18:47:02 +0000 (18:47 +0000)]
Merge "DO NOT MERGE ANYWHERE: Don't change screen on time on time changes" into mnc-dr-dev
Shreyas Basarge [Sat, 20 Feb 2016 02:22:00 +0000 (02:22 +0000)]
NPE fix for SyncStorageEngine read authority am:
a962d9eba7 am:
339c4f2b05 am:
58048c1f17 am:
eec587edf1 am:
6fc321a66d am:
5e4e02b009 am:
242bdb6d5b am:
4aa78554df am:
20339172bd am:
20c518816a
am:
7f35fa7365
* commit '
7f35fa7365b24f13f7553c452dc68f99fc7304ae':
NPE fix for SyncStorageEngine read authority
Shreyas Basarge [Sat, 20 Feb 2016 02:14:27 +0000 (02:14 +0000)]
NPE fix for SyncStorageEngine read authority am:
a962d9eba7 am:
339c4f2b05 am:
58048c1f17 am:
eec587edf1 am:
6fc321a66d am:
5e4e02b009 am:
242bdb6d5b am:
4aa78554df am:
20339172bd
am:
20c518816a
* commit '
20c518816a0946dff67a3b99b929bc30c9b0ad6c':
NPE fix for SyncStorageEngine read authority
Shreyas Basarge [Sat, 20 Feb 2016 02:05:16 +0000 (02:05 +0000)]
NPE fix for SyncStorageEngine read authority am:
a962d9eba7 am:
339c4f2b05 am:
58048c1f17 am:
eec587edf1 am:
6fc321a66d am:
5e4e02b009 am:
242bdb6d5b am:
4aa78554df
am:
20339172bd
* commit '
20339172bddac09730bf46f5eb289db4c299d64d':
NPE fix for SyncStorageEngine read authority
Shreyas Basarge [Sat, 20 Feb 2016 02:01:11 +0000 (02:01 +0000)]
NPE fix for SyncStorageEngine read authority am:
a962d9eba7 am:
339c4f2b05 am:
58048c1f17 am:
eec587edf1 am:
6fc321a66d am:
5e4e02b009 am:
242bdb6d5b
am:
4aa78554df
* commit '
4aa78554dfa1ff4cdb91ba560e3097d8febbe5c9':
NPE fix for SyncStorageEngine read authority
Shreyas Basarge [Sat, 20 Feb 2016 01:53:57 +0000 (01:53 +0000)]
NPE fix for SyncStorageEngine read authority am:
a962d9eba7 am:
339c4f2b05 am:
58048c1f17 am:
eec587edf1 am:
6fc321a66d am:
5e4e02b009
am:
242bdb6d5b
* commit '
242bdb6d5bec6e42b7caf42fd08ded0accc70fb8':
NPE fix for SyncStorageEngine read authority
Shreyas Basarge [Sat, 20 Feb 2016 01:45:01 +0000 (01:45 +0000)]
NPE fix for SyncStorageEngine read authority am:
a962d9eba7 am:
339c4f2b05 am:
58048c1f17 am:
eec587edf1 am:
6fc321a66d
am:
5e4e02b009
* commit '
5e4e02b00999db4513f43d5ddfdd2c71212cc503':
NPE fix for SyncStorageEngine read authority
Shreyas Basarge [Sat, 20 Feb 2016 01:37:34 +0000 (01:37 +0000)]
NPE fix for SyncStorageEngine read authority am:
a962d9eba7 am:
339c4f2b05 am:
58048c1f17 am:
eec587edf1
am:
6fc321a66d
* commit '
6fc321a66d74401e00b2203817f75e29a0426ab7':
NPE fix for SyncStorageEngine read authority
Shreyas Basarge [Sat, 20 Feb 2016 01:27:25 +0000 (01:27 +0000)]
NPE fix for SyncStorageEngine read authority am:
a962d9eba7 am:
339c4f2b05 am:
58048c1f17
am:
eec587edf1
* commit '
eec587edf1fb4e7bc5f38695f478f191dee1e2d4':
NPE fix for SyncStorageEngine read authority
Shreyas Basarge [Sat, 20 Feb 2016 01:01:10 +0000 (01:01 +0000)]
NPE fix for SyncStorageEngine read authority am:
a962d9eba7 am:
339c4f2b05
am:
58048c1f17
* commit '
58048c1f17d54166c6a048af2365d17dd32f4d57':
NPE fix for SyncStorageEngine read authority
Shreyas Basarge [Sat, 20 Feb 2016 00:47:41 +0000 (00:47 +0000)]
NPE fix for SyncStorageEngine read authority am:
a962d9eba7
am:
339c4f2b05
* commit '
339c4f2b055d40acea280a2d4b6c83c17f86a8b5':
NPE fix for SyncStorageEngine read authority
Shreyas Basarge [Sat, 20 Feb 2016 00:41:03 +0000 (00:41 +0000)]
NPE fix for SyncStorageEngine read authority
am:
a962d9eba7
* commit '
a962d9eba7a8f741ed149964126fb08fe4fd7128':
NPE fix for SyncStorageEngine read authority
Shreyas Basarge [Thu, 18 Feb 2016 11:56:05 +0000 (11:56 +0000)]
NPE fix for SyncStorageEngine read authority
Add a null check after an authority is read
from disk.
Bug:
26513719
Change-Id: I18f01828141110e776cc96f3b3be3d80125e70c1
Jeff Sharkey [Fri, 29 Jan 2016 17:45:45 +0000 (10:45 -0700)]
DO NOT MERGE ANYWHERE: Hack to get devices booting again.
If we try scheduling a pass before the system is ready, record a
pending event and dispatch once we're actually ready.
Bug:
26863668
Change-Id: I028285383c8bbe8b653aeaa7544eefe3d41277bc
(cherry picked from commit
538c11cf2175d4e30337e8776401bfede85866be)
Adam Lesinski [Wed, 27 Jan 2016 02:18:19 +0000 (18:18 -0800)]
DO NOT MERGE ANYWHERE: Don't change screen on time on time changes
Screen on time should be measured in elapsed realtime, not wallclock.
Cause a checkIdleStates to occur when reloading stats
(on rollover and on time change).
When time changes occur in the negative direction, the new stats file
we create can overlap the previous one with regards to its end timestamp.
Use the begin timestamp to determine which of the latest stats to merge.
(b/
22716352)
Bug:
26488100
Change-Id: If31b29bbbee9e98401205b5e26bce86e181286e7
OSDN Git Service
