Matthew Williams
0e7cd0a9fb
Redact Account info from getCurrentSyncs am: f39549e389
...
am: 1a0aed3257
2016-01-20 11:37:17 +00:00
Matthew Williams
1a0aed3257
Redact Account info from getCurrentSyncs
...
am: f39549e389
2016-01-20 11:32:56 +00:00
Matthew Williams
f39549e389
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 b63057e698
2016-01-20 00:02:58 +00:00
Geoff Mendal
8874f9754f
Revert "Import translations. DO NOT MERGE"
...
This reverts commit 9f9e736e0d
2016-01-11 14:24:19 +00:00
Geoff Mendal
9f9e736e0d
Import translations. DO NOT MERGE
...
Change-Id: I96e1041e8b74246336e2178ad73cb4d61ad41e37
Auto-generated-cl: translation import
2016-01-11 08:46:48 -05:00
Baligh Uddin
4340e0677b
Fix plurals variable to unblock Translations Pipeline.
...
am: 61f9f31468
2016-01-07 16:18:11 +00:00
Baligh Uddin
61f9f31468
Fix plurals variable to unblock Translations Pipeline.
...
Bug: 19067882
(cherry picked from commit 50d23adfe2
2016-01-06 18:54:41 +00:00
Robert Greenwalt
9887f2f50a
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
2015-12-04 15:54:53 -08:00
Matthew Williams
a0d20db02f
Sync extras bundle comparison can throw NPE am: c0f39c1ece
...
am: 34b700a7c2
2015-11-13 01:50:11 +00:00
Matthew Williams
34b700a7c2
Sync extras bundle comparison can throw NPE
...
am: c0f39c1ece
2015-11-13 01:41:59 +00:00
Matthew Williams
c0f39c1ece
Sync extras bundle comparison can throw NPE
...
BUG: 23591205
Change-Id: Ic6404c0befe70c34b078e0eae6a627826173d82c
(cherry picked from commit 9ad2c84033
2015-11-11 14:34:04 +00:00
Paul Jensen
773d71e7c4
am 962c3a0f: am ece4ac21: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into lmp-dev
...
* commit '962c3a0f2dd46d55ea591671c0a90c1c40214af7':
Don't mark NetworkRequests restricted when they don't have restricted caps
2015-09-23 11:13:48 +00:00
Paul Jensen
96cd7c14b5
am 635f8711: am a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev
...
* commit '635f871132449bea7489f6a61276979beeee5591':
Fix NOT_RESTRICTED network capability and enforce it.
2015-09-23 11:13:40 +00:00
Paul Jensen
962c3a0f2d
am ece4ac21: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into lmp-dev
...
* commit 'ece4ac2105d18d8d7b6296d6de3fdd5641c35258':
Don't mark NetworkRequests restricted when they don't have restricted caps
2015-09-23 11:06:32 +00:00
Paul Jensen
635f871132
am a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev
...
* commit 'a9e98343146244b71e236d82c95a8d0fa30a41c1':
Fix NOT_RESTRICTED network capability and enforce it.
2015-09-23 11:06:27 +00:00
Paul Jensen
ece4ac2105
Merge "Don't mark NetworkRequests restricted when they don't have restricted caps" into lmp-dev
2015-09-23 10:59:31 +00:00
Paul Jensen
a9e9834314
Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev
2015-09-23 10:58:57 +00:00
Zach Jang
e54c195a53
am 0a8197b1: am 1cf21e44: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
...
* commit '0a8197b1e43bc3771fc3f8595619603ec8f6f641':
DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
2015-09-21 18:58:18 +00:00
Zach Jang
0a8197b1e4
am 1cf21e44: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
...
* commit '1cf21e443aaf207b962f50169be28c0babe71f61':
DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
2015-09-17 20:04:23 +00:00
Zach Jang
1cf21e443a
DO NOT MERGE - Backport of ag/748165 to klp-dev
...
Security patch level in Settings
b/23946860
Change-Id: I610d4dedf18fe1825d7df5febf29e6f0c006490d
2015-09-17 01:20:27 +00:00
Paul Jensen
2b6af396ad
Don't mark NetworkRequests restricted when they don't have restricted caps
...
Requests without NET_CAPABILITIES_INTERNET and just the default network
capabilities should not be marked restricted. Without this fix apps
can hit permissions exceptions if they inadvertently make requests
without NET_CAPABILITIES_INTERNET.
Bug:23164917
Change-Id: I4c7136821315bcb05dfc42ffbc505a5d4f6109e6
(cherry picked from commit aae613d961
2015-08-28 12:50:09 -04:00
Paul Jensen
a12044215b
Fix NOT_RESTRICTED network capability and enforce it.
...
With this change:
1. NOT_RESTRICTED should be removed from NetworkRequests that bring up
special restricted carrier networks (e.g. IMS, FOTA).
2. NetworkRequests without NOT_RESTRICTED require CONNECTIVITY_INTERNAL
permission to register
3. Binding sockets to networks without NOT_RESTRICTED requires
CONNECTIVITY_INTERNAL permission
Bug:21637535
Change-Id: I5991d39facaa6b690e969fe15dcbeec52e918321
(cherry picked from commit 487ffe7d3d
2015-08-28 12:48:11 -04:00
Sebastien Hertz
87a786afdb
am 445ab7fa: am ff8dc212: Allow debugging only for apps forked from zygote
...
* commit '445ab7fa43f32ac1a256b15f5ab2bd619e9711e4':
Allow debugging only for apps forked from zygote
2015-08-21 07:08:43 +00:00
Sebastien Hertz
445ab7fa43
am ff8dc212: Allow debugging only for apps forked from zygote
...
* commit 'ff8dc21278b19b22ed8dc9f9475850838336d351':
Allow debugging only for apps forked from zygote
2015-08-21 07:01:02 +00:00
Sebastien Hertz
ff8dc21278
Allow debugging only for apps forked from zygote
...
When starting the runtime from app_process, we only pass JDWP options
if starting zygote. It prevents from opening a JDWP connection in
non-zygote programs while Android apps (forked from zygote) remain
debuggable.
Bug: 23050463
(cherry picked from commit 7a09b8322c
2015-08-19 11:25:56 +02:00
Amit Mahajan
853c617883
am 791dd2c6: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
...
* commit '791dd2c67466d2d9dafe58b1258e7718e3f30bc0':
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
2015-06-26 22:03:46 +00:00
Amit Mahajan
791dd2c674
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
...
Bug: 21697171
Change-Id: I7649c7341428194963ac74e9ae622dfa76ea738b
2015-06-26 17:33:37 +00:00
Amit Mahajan
90224355cd
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
...
Bug: 21697171
Change-Id: I7649c7341428194963ac74e9ae622dfa76ea738b
2015-06-26 17:33:27 +00:00
Leon Scroggins III
6b16398dd1
am 604ae32b: am 4dae8e41: Merge "DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes" into lmp-dev
...
* commit '604ae32bcc6791da813a8e594783b695131bf888':
DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
2015-06-10 15:51:38 +00:00
Leon Scroggins III
604ae32bcc
am 4dae8e41: Merge "DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes" into lmp-dev
...
* commit '4dae8e41b530672030731ec7cb69369da645cf30':
DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
2015-06-02 13:01:13 +00:00
Leon Scroggins III
4dae8e41b5
Merge "DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes" into lmp-dev
2015-06-02 12:48:43 +00:00
Svetoslav
18fb1c92d8
am bf0652ee: DO NOT MERGE Don\'t take flags when creating app widget config activity.
...
* commit 'bf0652eeea280bb1d687fe2fc3e869e0f6e9a541':
DO NOT MERGE Don't take flags when creating app widget config activity.
2015-06-01 23:02:37 +00:00
Svetoslav
bf0652eeea
DO NOT MERGE Don't take flags when creating app widget config activity.
...
bug:19618745
Change-Id: Ib0e421454d343e6db55d5538f1d55ac22a3dd722
2015-06-01 12:55:38 -07:00
Leon Scroggins III
6549eed89e
DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
...
bug: 20883006
Change-Id: I4f109667fb210a80fbddddf5f1bfb7ef3a02b6ce
2015-05-29 20:14:58 +00:00
Leon Scroggins III
b6e3f930c1
am 2bbcc253: am b36ace74: Merge "Check that the parcel contained the expected amount of region data. DO NOT MERGE" into lmp-dev
...
* commit '2bbcc253254a497b8f9bb86712fb6f0f2548e9f2':
Check that the parcel contained the expected amount of region data. DO NOT MERGE
2015-05-27 17:18:47 +00:00
Leon Scroggins III
2bbcc25325
am b36ace74: Merge "Check that the parcel contained the expected amount of region data. DO NOT MERGE" into lmp-dev
...
* commit 'b36ace7401c0e198ceddd2fdb908346b7bb5928f':
Check that the parcel contained the expected amount of region data. DO NOT MERGE
2015-05-27 14:39:21 +00:00
Leon Scroggins III
5cfd16201f
Check that the parcel contained the expected amount of region data. DO NOT MERGE
...
bug:20883006
Change-Id: Ib47a8ec8696dbc37e958b8dbceb43fcbabf6605b
2015-05-26 21:09:24 +00:00
John Reck
862540cdb1
Merge "Revert "DO NOT MERGE Backport of limited jank-tracking metrics"" into lmp-mr1-dev
2015-05-14 00:40:45 +00:00
John Reck
25607a6642
Revert "DO NOT MERGE Backport of limited jank-tracking metrics"
...
This reverts commit 2614bd225f
2015-05-13 21:42:28 +00:00
John Reck
69355eaa1c
Merge "DO NOT MERGE Backport of limited jank-tracking metrics" into lmp-mr1-dev
2015-05-13 21:42:13 +00:00
Leon Scroggins III
38cf068c04
am 16ac8ad7: am 4a6ca672: Make Bitmap_createFromParcel check the color count. DO NOT MERGE
...
* commit '16ac8ad7fac73524b5296f955884bd2aec405ded':
Make Bitmap_createFromParcel check the color count. DO NOT MERGE
2015-04-24 17:15:43 +00:00
Leon Scroggins III
16ac8ad7fa
am 4a6ca672: Make Bitmap_createFromParcel check the color count. DO NOT MERGE
...
* commit '4a6ca6724c789603626d74a8cc187365788a6cfd':
Make Bitmap_createFromParcel check the color count. DO NOT MERGE
2015-04-23 15:53:24 +00:00
Svet Ganov
68e6b5055b
DO NOT MERGE Don't take flags when creating app widget config activity.
...
bug:19618745
Change-Id: I7973ebfc67ebf52f14890dda9eb891a7b8a5a095
2015-04-20 17:16:38 +00:00
Leon Scroggins III
4a6ca6724c
Make Bitmap_createFromParcel check the color count. DO NOT MERGE
...
When reading from the parcel, if the number of colors is invalid, early
exit.
Add two more checks: setInfo must return true, and Parcel::readInplace
must return non-NULL. The former ensures that the previously read values
(width, height, etc) were valid, and the latter checks that the Parcel
had enough data even if the number of colors was reasonable.
Also use an auto-deleter to handle deletion of the SkBitmap.
Cherry pick from change-Id: Icbd562d6d1f131a723724883fd31822d337cf5a6
BUG=19666945
Change-Id: Iab0d218c41ae0c39606e333e44cda078eef32291
2015-04-16 15:38:03 +00:00
Quddus Chong
a9f6a9b769
Fixed broken link in UiAutomation.setRunAsMonkey() method description.
...
bug: 19711873
Change-Id: I4ebb50e03e6e979486ebd3a7c15f21358734574e
2015-04-07 13:04:39 -07:00
Svetoslav
37661db7fa
AccessibilityNodeInfo refresh returns a stale state. - DO NOT MERGE
...
AccessibilityNodeInfo refresh was getting the latest cached
state but this is not good enough as an accessibility service
can execute an action on the node and then refresh it to get
the new state.
bug:16954787
Change-Id: I004b4987b8dc423a2ab7031a4fbfe64365ddd7fe
(cherry picked from commit 5738fec00d
2015-03-31 01:25:35 +00:00
John Reck
2614bd225f
DO NOT MERGE Backport of limited jank-tracking metrics
...
Bug: 19821830
Cherry-pick of ba6adf66d3e70c5754d0
2015-03-18 14:22:01 -07:00
Craig Mautner
83a63bac5d
am 8fa394fa: Merge "Do not make ActivityContainer available to apps. DO NOT MERGE" into lmp-dev
...
* commit '8fa394fa8c4eb3ca832dac36baf5645a40d449f1':
Do not make ActivityContainer available to apps. DO NOT MERGE
2015-03-04 16:15:35 +00:00
Craig Mautner
8fa394fa8c
Merge "Do not make ActivityContainer available to apps. DO NOT MERGE" into lmp-dev
2015-03-04 16:09:29 +00:00
Joe Fernandez
246a3a4a79
am 14fcef3b: am c4418980: am a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs
...
* commit '14fcef3bf02f46a057676d7a6d755daee735c4ea':
Minor typo fixes in managed profile Javadoc reference pages.
2015-03-03 06:29:33 +00:00
