OSDN Git Service
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: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: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 [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
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
Matthew Williams [Thu, 21 Jan 2016 18:54:44 +0000 (18:54 +0000)]
DO NOT MERGE Redact Account info from getCurrentSyncs am:
a5cafd2a93 am:
06ef7dfdf0 am:
5fc753acaf -s ours am:
0d3e46391a am:
9c841923df -s ours am:
a76208d4e4 am:
9e52b29fe2
am:
1f6dbd910b -s ours
* commit '
1f6dbd910bf9bf93df8a708209e92add61fbff44':
DO NOT MERGE Redact Account info from getCurrentSyncs
Matthew Williams [Thu, 21 Jan 2016 18:48:55 +0000 (18:48 +0000)]
DO NOT MERGE Redact Account info from getCurrentSyncs am:
a5cafd2a93 am:
06ef7dfdf0 am:
5fc753acaf -s ours am:
0d3e46391a am:
9c841923df -s ours am:
a76208d4e4
am:
9e52b29fe2
* commit '
9e52b29fe27035df4720db582637157ce9ce268d':
DO NOT MERGE Redact Account info from getCurrentSyncs
Matthew Williams [Thu, 21 Jan 2016 18:41:55 +0000 (18:41 +0000)]
DO NOT MERGE Redact Account info from getCurrentSyncs am:
a5cafd2a93 am:
06ef7dfdf0 am:
5fc753acaf -s ours am:
0d3e46391a am:
9c841923df -s ours
am:
a76208d4e4
* commit '
a76208d4e4f7f690f5fde4210a00a5c3022721bd':
DO NOT MERGE Redact Account info from getCurrentSyncs
Matthew Williams [Thu, 21 Jan 2016 18:37:01 +0000 (18:37 +0000)]
DO NOT MERGE Redact Account info from getCurrentSyncs am:
a5cafd2a93 am:
06ef7dfdf0 am:
5fc753acaf -s ours am:
0d3e46391a
am:
9c841923df -s ours
* commit '
9c841923dfc36db046909e388b8a2fda3b694be1':
DO NOT MERGE Redact Account info from getCurrentSyncs
Matthew Williams [Thu, 21 Jan 2016 18:29:33 +0000 (18:29 +0000)]
DO NOT MERGE Redact Account info from getCurrentSyncs am:
a5cafd2a93 am:
06ef7dfdf0 am:
5fc753acaf -s ours
am:
0d3e46391a
* commit '
0d3e46391a0ffa0c428b8c8082195d1cbc4b1efa':
DO NOT MERGE Redact Account info from getCurrentSyncs
Matthew Williams [Thu, 21 Jan 2016 18:19:53 +0000 (18:19 +0000)]
DO NOT MERGE Redact Account info from getCurrentSyncs am:
a5cafd2a93 am:
06ef7dfdf0
am:
5fc753acaf -s ours
* commit '
5fc753acaf9731742957db256b2818376fe8c4a4':
DO NOT MERGE Redact Account info from getCurrentSyncs
Matthew Williams [Thu, 21 Jan 2016 18:14:32 +0000 (18:14 +0000)]
DO NOT MERGE Redact Account info from getCurrentSyncs am:
a5cafd2a93
am:
06ef7dfdf0
* commit '
06ef7dfdf0a3efb44326228c55309ec6df134376':
DO NOT MERGE Redact Account info from getCurrentSyncs
Matthew Williams [Thu, 21 Jan 2016 18:07:55 +0000 (18:07 +0000)]
DO NOT MERGE Redact Account info from getCurrentSyncs
am:
a5cafd2a93
* commit '
a5cafd2a93ce1c481328e2ce25c3bf2a19b81601':
DO NOT MERGE Redact Account info from getCurrentSyncs
Matthew Williams [Tue, 19 Jan 2016 23:04:04 +0000 (23:04 +0000)]
DO NOT MERGE Redact Account info from getCurrentSyncs
BUG:
26094635
If the caller to ContentResolver#getCurrentSyncs does not hold the
GET_ACCOUNTS permission, return a SyncInfo object that does not
contain any Account information.
Change-Id: I5628ebe1f56c8e3f784aaf1b3281e6b829d19314
(cherry picked from commit
b63057e698a01dafcefc7ba09b397b0336bba43d)
Matthew Williams [Wed, 20 Jan 2016 11:51:42 +0000 (11:51 +0000)]
Redact Account info from getCurrentSyncs am:
f39549e389 am:
1a0aed3257 am:
0e7cd0a9fb am:
be136b7a3e
am:
a947baa87c
* commit '
a947baa87caeb6733846d6de4ef2bf84f7ab0fa1':
Redact Account info from getCurrentSyncs
Matthew Williams [Wed, 20 Jan 2016 11:46:39 +0000 (11:46 +0000)]
Redact Account info from getCurrentSyncs am:
f39549e389 am:
1a0aed3257 am:
0e7cd0a9fb
am:
be136b7a3e
* commit '
be136b7a3e3f117dea283d194d1e6979fb47662b':
Redact Account info from getCurrentSyncs
Matthew Williams [Wed, 20 Jan 2016 11:41:23 +0000 (11:41 +0000)]
Redact Account info from getCurrentSyncs am:
f39549e389 am:
1a0aed3257
am:
0e7cd0a9fb
* commit '
0e7cd0a9fbdcb48c551d54627eb964364dd946d0':
Redact Account info from getCurrentSyncs
Matthew Williams [Wed, 20 Jan 2016 11:37:17 +0000 (11:37 +0000)]
Redact Account info from getCurrentSyncs am:
f39549e389
am:
1a0aed3257
* commit '
1a0aed3257ad1b8216930928090885cf4210bd87':
Redact Account info from getCurrentSyncs
Matthew Williams [Wed, 20 Jan 2016 11:32:56 +0000 (11:32 +0000)]
Redact Account info from getCurrentSyncs
am:
f39549e389
* commit '
f39549e389edf62f43bacd95a1b8580d75ad77ed':
Redact Account info from getCurrentSyncs
Matthew Williams [Tue, 19 Jan 2016 23:04:04 +0000 (23:04 +0000)]
Redact Account info from getCurrentSyncs
BUG:
26094635
If the caller to ContentResolver#getCurrentSyncs does not hold the
GET_ACCOUNTS permission, return a SyncInfo object that does not
contain any Account information.
Change-Id: I5628ebe1f56c8e3f784aaf1b3281e6b829d19314
(cherry picked from commit
b63057e698a01dafcefc7ba09b397b0336bba43d)
Geoff Mendal [Mon, 11 Jan 2016 15:37:27 +0000 (15:37 +0000)]
Merge "Revert "Import translations. DO NOT MERGE"" into lmp-mr1-ub-dev
am:
66841a62f1 -s ours
* commit '
66841a62f1d71eba843e69d1c8b5ca9453c5b42b':
Revert "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 11 Jan 2016 15:33:48 +0000 (15:33 +0000)]
Merge "Revert "Import translations. DO NOT MERGE"" into lmp-mr1-ub-dev
Geoff Mendal [Mon, 11 Jan 2016 15:33:28 +0000 (15:33 +0000)]
Revert "Import translations. DO NOT MERGE"
This reverts commit
a4505e926410cbf20dcd301f35f3496628cad9de.
Change-Id: I5929282b07b1df7a3d618e3be00974609cfcc5cf
Geoff Mendal [Mon, 11 Jan 2016 14:41:17 +0000 (14:41 +0000)]
Revert "Import translations. DO NOT MERGE" am:
8874f9754f -s ours am:
4df8f4abe0 -s ours am:
009fb756ec -s ours
am:
b409a99ccc -s ours
* commit '
b409a99ccc0a42814f3918c689d06526c09f726b':
Revert "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 11 Jan 2016 14:36:52 +0000 (14:36 +0000)]
Revert "Import translations. DO NOT MERGE" am:
8874f9754f -s ours am:
4df8f4abe0 -s ours
am:
009fb756ec -s ours
* commit '
009fb756ecabd78e5300c619c267f2e55cfd0922':
Revert "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 11 Jan 2016 14:32:35 +0000 (14:32 +0000)]
Revert "Import translations. DO NOT MERGE" am:
8874f9754f -s ours
am:
4df8f4abe0 -s ours
* commit '
4df8f4abe076d870b0e406efcd9c2d7cb6e4c81f':
Revert "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 11 Jan 2016 14:28:57 +0000 (14:28 +0000)]
Revert "Import translations. DO NOT MERGE"
am:
8874f9754f -s ours
* commit '
8874f9754f909dafcc2c5c23109e35297263f469':
Revert "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 11 Jan 2016 14:24:19 +0000 (14:24 +0000)]
Revert "Import translations. DO NOT MERGE"
This reverts commit
9f9e736e0dc08f7fd84d3b557ee4ae8212c61be4.
Change-Id: I7164f13dedd0713b948b4f6bcf4b54aa0bdcc0c8
Geoff Mendal [Mon, 11 Jan 2016 14:11:44 +0000 (14:11 +0000)]
Import translations. DO NOT MERGE am:
9f9e736e0d -s ours am:
b441c6926b -s ours am:
83bf32ebe5 -s ours
am:
42692affe2 -s ours
* commit '
42692affe23352b7e0bbcc9ef4d6f5fb661cc943':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 11 Jan 2016 14:05:05 +0000 (14:05 +0000)]
Import translations. DO NOT MERGE am:
9f9e736e0d -s ours am:
b441c6926b -s ours
am:
83bf32ebe5 -s ours
* commit '
83bf32ebe589fa2ed4c8501eb6b0def97e2dd9ac':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 11 Jan 2016 13:59:58 +0000 (13:59 +0000)]
Import translations. DO NOT MERGE am:
9f9e736e0d -s ours
am:
b441c6926b -s ours
* commit '
b441c6926bbc977956cd1cb6afcc338b09e5d6e3':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 11 Jan 2016 13:54:49 +0000 (13:54 +0000)]
Import translations. DO NOT MERGE
am:
9f9e736e0d -s ours
* commit '
9f9e736e0dc08f7fd84d3b557ee4ae8212c61be4':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 11 Jan 2016 13:46:48 +0000 (08:46 -0500)]
Import translations. DO NOT MERGE
Change-Id: I96e1041e8b74246336e2178ad73cb4d61ad41e37
Auto-generated-cl: translation import
Geoff Mendal [Mon, 11 Jan 2016 13:43:25 +0000 (13:43 +0000)]
Import translations. DO NOT MERGE
am:
a4505e9264 -s ours
* commit '
a4505e926410cbf20dcd301f35f3496628cad9de':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 11 Jan 2016 13:34:53 +0000 (08:34 -0500)]
Import translations. DO NOT MERGE
Change-Id: I3480788044f57b8097e54c28cb7984024719b8ca
Auto-generated-cl: translation import
Baligh Uddin [Thu, 7 Jan 2016 16:31:02 +0000 (16:31 +0000)]
Fix plurals variable to unblock Translations Pipeline. am:
61f9f31468 am:
4340e0677b am:
aa2210c5c1
am:
78f672ef05
* commit '
78f672ef05d9dbfbd0abf1b29b76f8cb22d84979':
Fix plurals variable to unblock Translations Pipeline.
Baligh Uddin [Thu, 7 Jan 2016 16:26:49 +0000 (16:26 +0000)]
Fix plurals variable to unblock Translations Pipeline. am:
61f9f31468 am:
4340e0677b
am:
aa2210c5c1
* commit '
aa2210c5c174fd681fd52fd43e55de6c018a93ad':
Fix plurals variable to unblock Translations Pipeline.
Baligh Uddin [Thu, 7 Jan 2016 16:22:23 +0000 (16:22 +0000)]
Fix plurals variable to unblock Translations Pipeline. am:
61f9f31468
am:
4340e0677b
* commit '
4340e0677b691f2ab12549556c23b88e599cf8c1':
Fix plurals variable to unblock Translations Pipeline.
Baligh Uddin [Thu, 7 Jan 2016 16:18:11 +0000 (16:18 +0000)]
Fix plurals variable to unblock Translations Pipeline.
am:
61f9f31468
* commit '
61f9f31468c5fc4dd2605c9ab8cb6a54cc58d6f9':
Fix plurals variable to unblock Translations Pipeline.
Baligh Uddin [Fri, 30 Jan 2015 15:09:16 +0000 (07:09 -0800)]
Fix plurals variable to unblock Translations Pipeline.
Bug:
19067882
(cherry picked from commit
50d23adfe26bf0cf9a34138efc299eaec04127e9)
Change-Id: I86022d6edab73dc4d11269783900710dc07a5b49
Robert Greenwalt [Fri, 18 Dec 2015 19:17:58 +0000 (19:17 +0000)]
resolve merge conflicts of
9887f2f50a to lmp-sprout-dev. am:
5a77651489 am:
5946a9b798 am:
2ecc918bd3
am:
81674b1ff5
* commit '
81674b1ff5deedcf2f1a79f07441e506a4f66354':
Protect some new broadcasts.
Robert Greenwalt [Fri, 18 Dec 2015 19:04:25 +0000 (19:04 +0000)]
resolve merge conflicts of
9887f2f50a to lmp-sprout-dev. am:
5a77651489 am:
5946a9b798
am:
2ecc918bd3
* commit '
2ecc918bd3c7f63ea70a7395b3a622c7f1a40f84':
Protect some new broadcasts.
Robert Greenwalt [Fri, 18 Dec 2015 18:48:59 +0000 (18:48 +0000)]
resolve merge conflicts of
9887f2f50a to lmp-sprout-dev. am:
5a77651489
am:
5946a9b798
* commit '
5946a9b798f9a4b0e9eacd2685fc5ec9d6cc9ed6':
Protect some new broadcasts.
Robert Greenwalt [Fri, 18 Dec 2015 18:38:10 +0000 (18:38 +0000)]
resolve merge conflicts of
9887f2f50a to lmp-sprout-dev.
am:
5a77651489
* commit '
5a77651489ace080671034a85e5771c6ddc73525':
Protect some new broadcasts.
Robert Greenwalt [Fri, 18 Dec 2015 03:32:43 +0000 (19:32 -0800)]
resolve merge conflicts of
9887f2f50a to lmp-sprout-dev.
Change-Id: I240cac5cba106a7f0fab61e04af2c757b46b0bb0
Robert Greenwalt [Thu, 17 Dec 2015 22:52:56 +0000 (22:52 +0000)]
Merge "Check permissions on getDeviceId." into mnc-dev
Adam Lesinski [Wed, 2 Dec 2015 23:40:19 +0000 (15:40 -0800)]
DO NOT MERGE: AAPT: Dump uses-permission-sdk-23
Include <uses-permission-sdk-23> permissions in dump badging and dump permissions.
This will also add implied features for that permission, marked as -sdk-23 features.
Ex:
uses-permission: name='android.permission.ACCESS_FINE_LOCATION'
uses-permission-sdk-23: name='android.permission.CAMERA'
feature-group: label=''
uses-feature: name='android.hardware.location'
uses-implied-feature: name='android.hardware.location' reason='...'
uses-feature-sdk-23: name='android.hardware.camera'
uses-implied-feature-sdk-23: name='android.hardware.camera' reason='...'
Bug:
24939655
Change-Id: Ifb374696ed4760b0ba2f1cc3516f3bf08e6cb6a3
(cherry picked from commit
5f3b2ecb3e9d27e77bd59c7b9006a6239b773944)
Robert Greenwalt [Fri, 4 Dec 2015 19:51:49 +0000 (11:51 -0800)]
Check permissions on getDeviceId.
This needs the package name passed in, so the aidl changes.
bug:
25778215
Change-Id: I804e6613ce0de5f2c7ab832ae62aecf269a6d213
Robert Greenwalt [Fri, 4 Dec 2015 23:54:53 +0000 (15:54 -0800)]
Protect some new broadcasts.
DEFAULT_*_SUBSCRIPTION_CHANGED broadcasts were added but not protected,
allowing 3rd parties to potentially spoof the bcasts feeding misinformation
to system listeners.
bug:
25778215
Change-Id: Ie5fc68a7d2224ce3f6beeca91667fe9b7654f0d5
Eino-Ville Talvala [Fri, 4 Dec 2015 23:54:05 +0000 (23:54 +0000)]
Merge "Camera: codegen doc update" into mnc-dev
Andy Hung [Tue, 1 Dec 2015 00:09:55 +0000 (16:09 -0800)]
DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread
Sample decoding still occurs in SoundPoolThread
without holding the SoundPool lock.
Bug:
25781119
Change-Id: I11fde005aa9cf5438e0390a0d2dfe0ec1dd282e8
(cherry picked from commit
0275a982abecee683f16c827d405eafe51fb67ae)
Yin-Chia Yeh [Fri, 20 Nov 2015 23:39:36 +0000 (15:39 -0800)]
Camera: codegen doc update
Bug:
25427163
Change-Id: I9e552a7ad365f2a45e5ebb74234b9dfb8eb1225c
Sreeram Ramachandran [Thu, 19 Nov 2015 16:40:35 +0000 (16:40 +0000)]
Don\'t use framework permission strings for netd permissions. am:
f1f45fe012 am:
0b542630dd am:
42faa221d7 am:
d3b6e2d790
am:
33c1718205
* commit '
33c17182058ce0f9d0bae48467827ff52422cdd2':
Don't use framework permission strings for netd permissions.
Sreeram Ramachandran [Thu, 19 Nov 2015 16:30:59 +0000 (16:30 +0000)]
Don\'t use framework permission strings for netd permissions. am:
f1f45fe012 am:
0b542630dd am:
42faa221d7
am:
d3b6e2d790
* commit '
d3b6e2d790f95f2fb3d85f0993b90bb8708a6114':
Don't use framework permission strings for netd permissions.
Sreeram Ramachandran [Thu, 19 Nov 2015 16:20:26 +0000 (16:20 +0000)]
Don\'t use framework permission strings for netd permissions. am:
f1f45fe012 am:
0b542630dd
am:
42faa221d7
* commit '
42faa221d7e8bc6db32698b3528e9c5898dbb943':
Don't use framework permission strings for netd permissions.
Sreeram Ramachandran [Thu, 19 Nov 2015 16:10:19 +0000 (16:10 +0000)]
Don\'t use framework permission strings for netd permissions. am:
f1f45fe012
am:
0b542630dd
* commit '
0b542630dd8b4d43f2e4f70563d3e44bb680455f':
Don't use framework permission strings for netd permissions.
Sreeram Ramachandran [Thu, 19 Nov 2015 15:59:42 +0000 (15:59 +0000)]
Don\'t use framework permission strings for netd permissions.
am:
f1f45fe012
* commit '
f1f45fe012ddbd516e797099994c400a1cac8581':
Don't use framework permission strings for netd permissions.
Sreeram Ramachandran [Tue, 4 Nov 2014 18:15:03 +0000 (10:15 -0800)]
Don't use framework permission strings for netd permissions.
These framework permission strings were being used as arbitrary labels
that mapped to netd permissions that have completely different meaning.
This leads to confusion, so use different strings.
This is being cherry picked from lmp-mr1-dev to lmp-dev to fix failures
when creating restricted networks due to prior back-port
a120442.
Bug:
21900139
Bug:
18194858
Change-Id: Ib3ec377ab26ce904d3d4678f04edec6cb1260517
(cherry picked from commit
0f8f120839120da543ee186cf25ce6e215423e99)
Michael Wright [Tue, 17 Nov 2015 20:24:16 +0000 (20:24 +0000)]
DO NOT MERGE. Prevent recents from coming up when in SUW am:
84669ca8de am:
614ea46405
am:
bd23716585 -s ours
* commit '
bd23716585bd21b4dc4bf87bd56ce588c8d457df':
DO NOT MERGE. Prevent recents from coming up when in SUW
Michael Wright [Tue, 17 Nov 2015 20:06:27 +0000 (20:06 +0000)]
DO NOT MERGE. Prevent recents from coming up when in SUW am:
84669ca8de
am:
614ea46405
* commit '
614ea464051835e1c2267ef2bc343f98b62b177a':
DO NOT MERGE. Prevent recents from coming up when in SUW
Michael Wright [Tue, 17 Nov 2015 19:52:13 +0000 (19:52 +0000)]
DO NOT MERGE. Prevent recents from coming up when in SUW
am:
84669ca8de
* commit '
84669ca8de55d38073a0dcb01074233b0a417541':
DO NOT MERGE. Prevent recents from coming up when in SUW
Michael Wright [Tue, 17 Nov 2015 18:33:38 +0000 (18:33 +0000)]
Merge "DO NOT MERGE. Prevent recents from coming up when in SUW" into mnc-dev
Sanket Padawe [Tue, 17 Nov 2015 01:07:28 +0000 (01:07 +0000)]
Merge "Don't allow contact sharing by default for device not recognized as carkit." into mnc-dev
Eino-Ville Talvala [Mon, 9 Nov 2015 02:27:20 +0000 (18:27 -0800)]
Camera: Minor documentation update
- Further clarify hardware.camera feature being only for the back camera
Bug:
24540625
Change-Id: I7a698740475aa4932648c8f62aab81d5f9341030
Michael Wright [Fri, 13 Nov 2015 21:53:14 +0000 (21:53 +0000)]
DO NOT MERGE. Prevent recents from coming up when in SUW
Bug:
25229538
Change-Id: Ib19f368e9ef383ba5e60ea0b88193178d5769469
Michael Wright [Fri, 13 Nov 2015 21:52:18 +0000 (21:52 +0000)]
DO NOT MERGE. Prevent recents from coming up when in SUW
Bug:
25229538
Change-Id: If4f276d3f7c04fd89011068d90a3c3c60593bc05
Winson Chung [Fri, 13 Nov 2015 18:21:55 +0000 (18:21 +0000)]
Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into lmp-mr1-dev am:
bb4da4efc3 am:
b133b984a0
am:
32265b9ea0 -s ours
* commit '
32265b9ea000b04ac62f3c114edb063246260401':
DO NOT MERGE Ensure that the device is provisioned before showing Recents.
Winson Chung [Fri, 13 Nov 2015 18:15:30 +0000 (18:15 +0000)]
Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into lmp-mr1-dev am:
bb4da4efc3
am:
b133b984a0
* commit '
b133b984a0644a78270d51007123e75ded24eb14':
DO NOT MERGE Ensure that the device is provisioned before showing Recents.
Winson Chung [Fri, 13 Nov 2015 18:08:38 +0000 (18:08 +0000)]
Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into lmp-mr1-dev
am:
bb4da4efc3
* commit '
bb4da4efc320caee77f11bb316145b8e5f264e07':
DO NOT MERGE Ensure that the device is provisioned before showing Recents.
Winson Chung [Fri, 13 Nov 2015 18:02:47 +0000 (18:02 +0000)]
Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into mnc-dev
Winson Chung [Fri, 13 Nov 2015 18:02:38 +0000 (18:02 +0000)]
Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into lmp-mr1-dev
Shreyas Basarge [Fri, 13 Nov 2015 02:29:47 +0000 (02:29 +0000)]
Sync extras bundle comparison can throw NPE am:
2f137b7705 am:
294611faa8 am:
cc7c1d3812 am:
f5f03a19af am:
44368e6dd4 am:
bf29f10c1e am:
359ee7f47d
am:
64bdb9f06b
* commit '
64bdb9f06b7fc3e497088243a966dec95d1936e1':
Sync extras bundle comparison can throw NPE
Shreyas Basarge [Fri, 13 Nov 2015 02:23:40 +0000 (02:23 +0000)]
Sync extras bundle comparison can throw NPE am:
2f137b7705 am:
294611faa8 am:
cc7c1d3812 am:
f5f03a19af am:
44368e6dd4 am:
bf29f10c1e
am:
359ee7f47d
* commit '
359ee7f47de2eee82951abed294e4db44405973c':
Sync extras bundle comparison can throw NPE
Shreyas Basarge [Fri, 13 Nov 2015 02:16:24 +0000 (02:16 +0000)]
Sync extras bundle comparison can throw NPE am:
2f137b7705 am:
294611faa8 am:
cc7c1d3812 am:
f5f03a19af am:
44368e6dd4
am:
bf29f10c1e
* commit '
bf29f10c1e7dd37c3020bc7a792bb7bda451a149':
Sync extras bundle comparison can throw NPE
Shreyas Basarge [Fri, 13 Nov 2015 02:09:36 +0000 (02:09 +0000)]
Sync extras bundle comparison can throw NPE am:
2f137b7705 am:
294611faa8 am:
cc7c1d3812 am:
f5f03a19af
am:
44368e6dd4
* commit '
44368e6dd4ec56e9eca47b1e81d307f672bb3006':
Sync extras bundle comparison can throw NPE
Matthew Williams [Fri, 13 Nov 2015 02:09:35 +0000 (02:09 +0000)]
Sync extras bundle comparison can throw NPE am:
c0f39c1ece am:
34b700a7c2 am:
a0d20db02f am:
6d13650c74
am:
c455148edc
* commit '
c455148edce05b4862df8853a78276fb5f28151a':
Sync extras bundle comparison can throw NPE
Shreyas Basarge [Fri, 13 Nov 2015 02:03:01 +0000 (02:03 +0000)]
Sync extras bundle comparison can throw NPE am:
2f137b7705 am:
294611faa8 am:
cc7c1d3812
am:
f5f03a19af
* commit '
f5f03a19affc6775ac3e44a3540351e132fffc0e':
Sync extras bundle comparison can throw NPE
Matthew Williams [Fri, 13 Nov 2015 02:03:01 +0000 (02:03 +0000)]
Sync extras bundle comparison can throw NPE am:
c0f39c1ece am:
34b700a7c2 am:
a0d20db02f
am:
6d13650c74
* commit '
6d13650c74b7cab047e43a4a3a0b880a832dd2db':
Sync extras bundle comparison can throw NPE
Shreyas Basarge [Fri, 13 Nov 2015 01:56:34 +0000 (01:56 +0000)]
Sync extras bundle comparison can throw NPE am:
2f137b7705 am:
294611faa8
am:
cc7c1d3812
* commit '
cc7c1d381249edfd906cb57afbd8589e6c345141':
Sync extras bundle comparison can throw NPE
Matthew Williams [Fri, 13 Nov 2015 01:56:30 +0000 (01:56 +0000)]
Sync extras bundle comparison can throw NPE am:
c0f39c1ece am:
34b700a7c2
am:
a0d20db02f
* commit '
a0d20db02f0e6cfc06ec37cfc68ce626dd35858a':
Sync extras bundle comparison can throw NPE
Matthew Williams [Fri, 13 Nov 2015 01:50:11 +0000 (01:50 +0000)]
Sync extras bundle comparison can throw NPE am:
c0f39c1ece
am:
34b700a7c2
* commit '
34b700a7c2355f1dbea4b8d796619033bdd87a0c':
Sync extras bundle comparison can throw NPE
Shreyas Basarge [Fri, 13 Nov 2015 01:50:02 +0000 (01:50 +0000)]
Sync extras bundle comparison can throw NPE am:
2f137b7705
am:
294611faa8
* commit '
294611faa8bd1bdbf75adc3cee835b69d348df86':
Sync extras bundle comparison can throw NPE
Shreyas Basarge [Fri, 13 Nov 2015 01:41:59 +0000 (01:41 +0000)]
Sync extras bundle comparison can throw NPE
am:
2f137b7705
* commit '
2f137b7705875ee026319abb8e512d918c118222':
Sync extras bundle comparison can throw NPE
Matthew Williams [Fri, 13 Nov 2015 01:41:59 +0000 (01:41 +0000)]
Sync extras bundle comparison can throw NPE
am:
c0f39c1ece
* commit '
c0f39c1ece72a05c796f7ba30b7a2b5b580d5025':
Sync extras bundle comparison can throw NPE
Sanket Padawe [Wed, 11 Nov 2015 23:01:35 +0000 (15:01 -0800)]
Don't allow contact sharing by default for device not recognized as carkit.
+ Don't allow contact sharing by default for devices not recognized
as carkit at pair time.
Bug:
23607427
Change-Id: If6babb10117ba7ee5008a4a29450a7cb981bea4a
(cherry picked from commit
07533dbffff5551ad4c58852b5856f57d7da6801)
Shreyas Basarge [Thu, 12 Nov 2015 15:32:44 +0000 (15:32 +0000)]
Sync extras bundle comparison can throw NPE
Bug:
23591205
Change-Id: I960dfcc1584c0a17685790d5d722eaf11b930e25
Eino-Ville Talvala [Mon, 9 Nov 2015 02:27:20 +0000 (18:27 -0800)]
Camera: Documentation updates
- Clarify hardware.camera feature being only for the back camera
- Clarify what setting a CaptureRequest field to null does
- Use preCorrectionActiveArray instead of activeArray in list of
possible raw output sizes
- Clarify length of GPS processing field for camera1 API
Bug:
24540625
Bug:
23908116
Bug:
23051627
Bug:
17345901
Change-Id: Iaf11fdf626268cf30f66b3628153ec3ac770c4f4
Winson [Wed, 4 Nov 2015 22:24:43 +0000 (14:24 -0800)]
DO NOT MERGE Ensure that the device is provisioned before showing Recents.
Bug:
25476219
Change-Id: Ibbe621748f7275f8c1ccded84612ca16292559eb
Winson [Wed, 11 Nov 2015 00:19:38 +0000 (16:19 -0800)]
DO NOT MERGE Ensure that the device is provisioned before showing Recents.
Bug:
25476219
Change-Id: I5bb9cca74790521de71c0037b4f2421c3d21b3f6
Matthew Williams [Fri, 16 Oct 2015 19:01:31 +0000 (12:01 -0700)]
Sync extras bundle comparison can throw NPE
BUG:
23591205
Change-Id: Ic6404c0befe70c34b078e0eae6a627826173d82c
(cherry picked from commit
9ad2c8403354a985258c098681067e74b9e2f638)
OSDN Git Service
