OSDN Git Service
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 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 13:46:48 +0000 (08:46 -0500)]
Import translations. DO NOT MERGE
Change-Id: I96e1041e8b74246336e2178ad73cb4d61ad41e37
Auto-generated-cl: translation import
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 03:32:43 +0000 (19:32 -0800)]
resolve merge conflicts of
9887f2f50a to lmp-sprout-dev.
Change-Id: I240cac5cba106a7f0fab61e04af2c757b46b0bb0
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
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)
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
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
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
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
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
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
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)
Dan Sandler [Fri, 23 Oct 2015 23:39:22 +0000 (23:39 +0000)]
Delay hiding the cast icon for 3 seconds. DO NOT MERGE
am:
1044e162c3
* commit '
1044e162c3dc4169b79112fc1a2de14757bca8c3':
Delay hiding the cast icon for 3 seconds. DO NOT MERGE
Dan Sandler [Tue, 20 Oct 2015 23:01:27 +0000 (16:01 -0700)]
Delay hiding the cast icon for 3 seconds. DO NOT MERGE
Ensure that the user has had a chance to see it for a few
seconds after screen recording has ended.
Bug:
19121797
(cherry picked from commit
8fd25bf7711aabffe73213ba1f9056f285270695)
Change-Id: I14d9fb54521dc6d60822e7c683e4e92fd62cdc6a
Adrian Roos [Thu, 24 Sep 2015 22:49:19 +0000 (22:49 +0000)]
am
c9f7abe3: Merge "DO NOT MERGE Send next alarm\'s show intent via PendingIntent" into lmp-dev
* commit '
c9f7abe3705f7c74ad768e0a8e093f6f11e70e1c':
DO NOT MERGE Send next alarm's show intent via PendingIntent
Adrian Roos [Thu, 24 Sep 2015 22:39:23 +0000 (22:39 +0000)]
Merge "DO NOT MERGE Send next alarm's show intent via PendingIntent" into lmp-dev
Paul Jensen [Wed, 23 Sep 2015 11:06:32 +0000 (11:06 +0000)]
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
Paul Jensen [Wed, 23 Sep 2015 11:06:27 +0000 (11:06 +0000)]
am
a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev
* commit '
a9e98343146244b71e236d82c95a8d0fa30a41c1':
Fix NOT_RESTRICTED network capability and enforce it.
Paul Jensen [Wed, 23 Sep 2015 10:59:31 +0000 (10:59 +0000)]
Merge "Don't mark NetworkRequests restricted when they don't have restricted caps" into lmp-dev
Paul Jensen [Wed, 23 Sep 2015 10:58:57 +0000 (10:58 +0000)]
Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev
Zach Jang [Thu, 17 Sep 2015 20:44:41 +0000 (20:44 +0000)]
am
7b5bf993: am
fe4cbf2b: (-s ours) am
cff4e09e: am
bdf7f358: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
* commit '
7b5bf993e4cc9f333a9adb3a00672c668a0f3fdb':
DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
Zach Jang [Thu, 17 Sep 2015 20:32:53 +0000 (20:32 +0000)]
am
fe4cbf2b: (-s ours) am
cff4e09e: am
bdf7f358: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
* commit '
fe4cbf2b1b135b327018915a512a8e6293a96017':
DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
Zach Jang [Thu, 17 Sep 2015 20:24:00 +0000 (20:24 +0000)]
am
cff4e09e: am
bdf7f358: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
* commit '
cff4e09e26e3b976aa0273df78e89f592fc6d287':
DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
Zach Jang [Thu, 17 Sep 2015 20:09:55 +0000 (20:09 +0000)]
am
bdf7f358: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
* commit '
bdf7f3583c637f370e97e74526df14b9c70e6493':
DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
Zach Jang [Thu, 17 Sep 2015 20:04:23 +0000 (20:04 +0000)]
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
Zach Jang [Fri, 11 Sep 2015 23:35:04 +0000 (16:35 -0700)]
DO NOT MERGE - Backport of ag/748165 to klp-dev
Security patch level in Settings
b/
23946860
Change-Id: I610d4dedf18fe1825d7df5febf29e6f0c006490d
Zach Jang [Fri, 11 Sep 2015 23:35:04 +0000 (16:35 -0700)]
DO NOT MERGE - Backport of ag/748165 to klp-dev
Security patch level in Settings
b/
23946860
Change-Id: I610d4dedf18fe1825d7df5febf29e6f0c006490d
Adrian Roos [Sat, 12 Sep 2015 00:46:23 +0000 (17:46 -0700)]
DO NOT MERGE Send next alarm's show intent via PendingIntent
Bug:
23909438
Change-Id: I0bb277c8385b7936fbda03cd76f02248c4fc55de
Michael Wright [Sat, 12 Sep 2015 06:29:09 +0000 (06:29 +0000)]
am
4c330c6a: DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.
* commit '
4c330c6ae53df48f6486b6f047021b204fc66594':
DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.
Michael Wright [Mon, 24 Aug 2015 23:00:05 +0000 (00:00 +0100)]
DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.
If the given app name is too long for the permissions dialog, then
it can push the warning that the application will be able to record
the screen below the fold, letting the app basically set its own
dialog message in a way that a user would be difficult to detect as
fraudulant.
Bug:
23345192
Change-Id: If5881ca75d5c155ef5174351d245dbc3abdaa584
Paul Jensen [Fri, 28 Aug 2015 16:00:15 +0000 (12:00 -0400)]
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
aae613d96134245af7c55976731a49fa59e77470)
Paul Jensen [Fri, 28 Aug 2015 15:58:50 +0000 (11:58 -0400)]
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
487ffe7d3d84bf65212158f7098e8a84b5b55e09)
Sebastien Hertz [Fri, 21 Aug 2015 10:29:30 +0000 (10:29 +0000)]
am
50af68e7: am
55f86b18: (-s ours) am
9e7a0ddb: am
18089ceb: Allow debugging only for apps forked from zygote DO NOT MERGE
* commit '
50af68e74a756d0fc81eda2a3580dbcf70362d42':
Allow debugging only for apps forked from zygote DO NOT MERGE
Sebastien Hertz [Fri, 21 Aug 2015 10:18:38 +0000 (10:18 +0000)]
am
55f86b18: (-s ours) am
9e7a0ddb: am
18089ceb: Allow debugging only for apps forked from zygote DO NOT MERGE
* commit '
55f86b1811f0411a5d685d6c97772b846a706e19':
Allow debugging only for apps forked from zygote DO NOT MERGE
Sebastien Hertz [Fri, 21 Aug 2015 10:09:22 +0000 (10:09 +0000)]
am
9e7a0ddb: am
18089ceb: Allow debugging only for apps forked from zygote DO NOT MERGE
* commit '
9e7a0ddb65ad0bd04d49a24a68aa96730b2ba9a1':
Allow debugging only for apps forked from zygote DO NOT MERGE
Sebastien Hertz [Fri, 21 Aug 2015 09:50:24 +0000 (09:50 +0000)]
am
18089ceb: Allow debugging only for apps forked from zygote DO NOT MERGE
* commit '
18089ceb71ad4ce2332096b8e7b5f8c1f8e263db':
Allow debugging only for apps forked from zygote DO NOT MERGE
Sebastien Hertz [Fri, 21 Aug 2015 07:01:02 +0000 (07:01 +0000)]
am
ff8dc212: Allow debugging only for apps forked from zygote
* commit '
ff8dc21278b19b22ed8dc9f9475850838336d351':
Allow debugging only for apps forked from zygote
Sebastien Hertz [Mon, 10 Aug 2015 16:55:34 +0000 (18:55 +0200)]
Allow debugging only for apps forked from zygote DO NOT MERGE
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
7a09b8322cab26d6e3da1362d3c74964ae66b5d4)
Change-Id: I2400ecc8aea7579c43300efccf288b69f70eef53
Sebastien Hertz [Mon, 10 Aug 2015 16:55:34 +0000 (18:55 +0200)]
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
7a09b8322cab26d6e3da1362d3c74964ae66b5d4)
Change-Id: Ib5b6d3bc4d45389993c3c54226df5a7b72479d19
Adrian Roos [Thu, 23 Jul 2015 18:34:56 +0000 (18:34 +0000)]
am
9b6a6099: Prevent insanely long passwords from crashing SystemUI
* commit '
9b6a60991453136819a6feeca404e1102e78f735':
Prevent insanely long passwords from crashing SystemUI
Adrian Roos [Tue, 21 Jul 2015 20:27:22 +0000 (13:27 -0700)]
Prevent insanely long passwords from crashing SystemUI
Bug:
22214934
Change-Id: I32e238e53ac4b6dd0ae6de226b98894c495b256f
Wale Ogunwale [Wed, 1 Jul 2015 17:17:23 +0000 (17:17 +0000)]
am
742bfa80: am
f3dbb57e: am
c215b2b2: am
dc9cfca8: Merge "Prevent system uid component from running in an app process" into klp-dev
* commit '
742bfa809cf2c022d690f84b4213e908ee66e8aa':
Prevent system uid component from running in an app process
Wale Ogunwale [Wed, 1 Jul 2015 17:03:02 +0000 (17:03 +0000)]
am
f3dbb57e: am
c215b2b2: am
dc9cfca8: Merge "Prevent system uid component from running in an app process" into klp-dev
* commit '
f3dbb57ee8fce4b7c2cad352ebe5096a880ae06b':
Prevent system uid component from running in an app process
Wale Ogunwale [Wed, 1 Jul 2015 16:39:11 +0000 (16:39 +0000)]
am
c215b2b2: am
dc9cfca8: Merge "Prevent system uid component from running in an app process" into klp-dev
* commit '
c215b2b24575e6d7693f396c7fdfe675d5ea9d1c':
Prevent system uid component from running in an app process
Wale Ogunwale [Wed, 1 Jul 2015 16:18:42 +0000 (16:18 +0000)]
am
df9948d8: Merge "Prevent system uid component from running in an app process" into lmp-dev
* commit '
df9948d81232a03271113c16bee6f3ab6b826bad':
Prevent system uid component from running in an app process
Wale Ogunwale [Wed, 1 Jul 2015 16:18:17 +0000 (16:18 +0000)]
am
dc9cfca8: Merge "Prevent system uid component from running in an app process" into klp-dev
* commit '
dc9cfca80139714ca37122148d041beedbf0ceb2':
Prevent system uid component from running in an app process
Wale Ogunwale [Wed, 1 Jul 2015 16:06:46 +0000 (16:06 +0000)]
Merge "Prevent system uid component from running in an app process" into lmp-dev
Wale Ogunwale [Wed, 1 Jul 2015 16:06:32 +0000 (16:06 +0000)]
Merge "Prevent system uid component from running in an app process" into klp-dev
Amit Mahajan [Tue, 30 Jun 2015 19:45:08 +0000 (19:45 +0000)]
am
bcf9223b: am
23444e76: (-s ours) am
eee86342: am
9edf7ad5: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
* commit '
bcf9223b3bbe542d0ab040398c26cf1c600f5493':
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
Joe Fernandez [Tue, 30 Jun 2015 19:45:03 +0000 (19:45 +0000)]
am
4bd25634: am
765255b4: am
6f8dab04: Merge "Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time." into klp-modular-docs
* commit '
4bd25634f13876e7ab31b6de66ceb9ca1cdc784d':
Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time.
Amit Mahajan [Tue, 30 Jun 2015 18:21:50 +0000 (18:21 +0000)]
am
23444e76: (-s ours) am
eee86342: am
9edf7ad5: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
* commit '
23444e76d2480d2537c2b6418f0c6c89c8cdb590':
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
Joe Fernandez [Tue, 30 Jun 2015 18:21:41 +0000 (18:21 +0000)]
am
765255b4: am
6f8dab04: Merge "Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time." into klp-modular-docs
* commit '
765255b41229553842da855b8e5d9dfa87cf8e2b':
Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time.
Amit Mahajan [Fri, 26 Jun 2015 22:31:49 +0000 (22:31 +0000)]
am
eee86342: am
9edf7ad5: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
* commit '
eee86342713a7c89c30933a22f8b7e190d3af10f':
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
Amit Mahajan [Fri, 26 Jun 2015 22:14:24 +0000 (22:14 +0000)]
am
9edf7ad5: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
* commit '
9edf7ad563ead119698ac3106b699515bd160ffe':
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
Amit Mahajan [Fri, 26 Jun 2015 22:03:46 +0000 (22:03 +0000)]
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.
Amit Mahajan [Thu, 11 Jun 2015 00:02:39 +0000 (17:02 -0700)]
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
Bug:
21697171
Change-Id: I7649c7341428194963ac74e9ae622dfa76ea738b
Amit Mahajan [Thu, 11 Jun 2015 00:02:39 +0000 (17:02 -0700)]
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
Bug:
21697171
Change-Id: I7649c7341428194963ac74e9ae622dfa76ea738b
Wale Ogunwale [Thu, 25 Jun 2015 16:29:58 +0000 (09:29 -0700)]
Prevent system uid component from running in an app process
Bug:
21669445
Change-Id: I792c6e676d4b6d54a51228d264130b8125075d98
Wale Ogunwale [Thu, 11 Jun 2015 19:44:47 +0000 (12:44 -0700)]
Prevent system uid component from running in an app process
Bug:
21669445
Change-Id: I11d0bc5301d7e2a64972221f54f3cbd611f8e404
(cherry picked from commit
44368567f840e3469b5fd2c9399ed444b6f46ebf)
Joe Fernandez [Fri, 19 Jun 2015 23:01:45 +0000 (23:01 +0000)]
am
6f8dab04: Merge "Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time." into klp-modular-docs
* commit '
6f8dab04572c772decef9b7ec5380f8e240a51ce':
Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time.
Joe Fernandez [Fri, 19 Jun 2015 22:49:26 +0000 (22:49 +0000)]
Merge "Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time." into klp-modular-docs
Leon Scroggins III [Tue, 2 Jun 2015 13:41:50 +0000 (13:41 +0000)]
am
a6932472: am
5b751c80: (-s ours) am
7496e153: am
0d208173: DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
* commit '
a6932472d976c63a6b3970aac3607c4fe3a790b9':
DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
Leon Scroggins III [Tue, 2 Jun 2015 13:29:02 +0000 (13:29 +0000)]
am
5b751c80: (-s ours) am
7496e153: am
0d208173: DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
* commit '
5b751c80070a6c790fd386808be2a4258e37e69a':
DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
Leon Scroggins III [Tue, 2 Jun 2015 13:12:12 +0000 (13:12 +0000)]
am
7496e153: am
0d208173: DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
* commit '
7496e153f4308b39df9c53615770f44f593c3504':
DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
Leon Scroggins III [Tue, 2 Jun 2015 13:01:13 +0000 (13:01 +0000)]
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
Leon Scroggins III [Tue, 2 Jun 2015 12:59:29 +0000 (12:59 +0000)]
am
0d208173: DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
* commit '
0d2081734ce124191ac1f3e8585336daa414abbe':
DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
Leon Scroggins III [Tue, 2 Jun 2015 12:48:41 +0000 (12:48 +0000)]
Merge "DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes" into lmp-dev
Svetoslav [Mon, 1 Jun 2015 23:02:37 +0000 (23:02 +0000)]
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.
Svetoslav [Mon, 1 Jun 2015 19:55:35 +0000 (12:55 -0700)]
DO NOT MERGE Don't take flags when creating app widget config activity.
bug:
19618745
Change-Id: Ib0e421454d343e6db55d5538f1d55ac22a3dd722
Leon Scroggins III [Fri, 29 May 2015 20:13:11 +0000 (16:13 -0400)]
DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
bug:
20883006
Change-Id: I4f109667fb210a80fbddddf5f1bfb7ef3a02b6ce
Leon Scroggins III [Fri, 29 May 2015 20:13:11 +0000 (16:13 -0400)]
DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
bug:
20883006
Change-Id: I4f109667fb210a80fbddddf5f1bfb7ef3a02b6ce
Leon Scroggins III [Wed, 27 May 2015 15:22:45 +0000 (15:22 +0000)]
am
c7a558fe: am
425d7c87: (-s ours) am
11297581: am
18d79267: Check that the parcel contained the expected amount of region data. DO NOT MERGE
* commit '
c7a558fe73631e438061c31a54861594f0eb024f':
Check that the parcel contained the expected amount of region data. DO NOT MERGE
Leon Scroggins III [Wed, 27 May 2015 15:10:30 +0000 (15:10 +0000)]
am
425d7c87: (-s ours) am
11297581: am
18d79267: Check that the parcel contained the expected amount of region data. DO NOT MERGE
* commit '
425d7c8713679ce9799139f7f91c6a45caa3b486':
Check that the parcel contained the expected amount of region data. DO NOT MERGE
Leon Scroggins III [Wed, 27 May 2015 14:53:00 +0000 (14:53 +0000)]
am
11297581: am
18d79267: Check that the parcel contained the expected amount of region data. DO NOT MERGE
* commit '
11297581667128d2568a47ee03acab5c4f9f2784':
Check that the parcel contained the expected amount of region data. DO NOT MERGE
Leon Scroggins III [Wed, 27 May 2015 14:39:21 +0000 (14:39 +0000)]
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
Leon Scroggins III [Wed, 27 May 2015 14:37:18 +0000 (14:37 +0000)]
am
18d79267: Check that the parcel contained the expected amount of region data. DO NOT MERGE
* commit '
18d7926709451b9e767731f46778e4238fc8e3b5':
Check that the parcel contained the expected amount of region data. DO NOT MERGE
Leon Scroggins III [Wed, 27 May 2015 14:29:30 +0000 (14:29 +0000)]
Merge "Check that the parcel contained the expected amount of region data. DO NOT MERGE" into lmp-dev
Wale Ogunwale [Wed, 27 May 2015 04:50:11 +0000 (04:50 +0000)]
am
c9a0c0b9: Lockdown AM.getRunningAppProcesses API with permission.REAL_GET_TASKS
* commit '
c9a0c0b90773fded6c251646300231f67c891b78':
Lockdown AM.getRunningAppProcesses API with permission.REAL_GET_TASKS
Leon Scroggins III [Tue, 26 May 2015 20:41:09 +0000 (16:41 -0400)]
Check that the parcel contained the expected amount of region data. DO NOT MERGE
bug:
20883006
Change-Id: Ib47a8ec8696dbc37e958b8dbceb43fcbabf6605b
Leon Scroggins III [Tue, 26 May 2015 20:41:09 +0000 (16:41 -0400)]
Check that the parcel contained the expected amount of region data. DO NOT MERGE
bug:
20883006
Change-Id: Ib47a8ec8696dbc37e958b8dbceb43fcbabf6605b
Wale Ogunwale [Mon, 6 Apr 2015 23:08:52 +0000 (16:08 -0700)]
Lockdown AM.getRunningAppProcesses API with permission.REAL_GET_TASKS
* Applications must now have ...permission.REAL_GET_TASKS to
be able to get process information for all applications.
* Only the process information for the calling application will be
returned if the app doesn't have the permission.
* Privilages apps will temporarily be able to get process information
for all applications if they don't have the new permission, but have
deprecated ...permission.GET_TASKS.
Bug:
20034603
Change-Id: I67ae9491f65d2280adb6a81593693d499714a216
(cherry picked from commit
9dbaa54f6834e013a63f18bd51ace554de811d80)
Leon Scroggins III [Thu, 23 Apr 2015 16:41:49 +0000 (16:41 +0000)]
am
ea2dcda7: am
ee35410f: (-s ours) am
a7501119: am
69b8e962: Make Bitmap_createFromParcel check the color count. DO NOT MERGE
* commit '
ea2dcda788e035ccdc55ab16303c9e34740a3f8c':
Make Bitmap_createFromParcel check the color count. DO NOT MERGE
Leon Scroggins III [Thu, 23 Apr 2015 16:29:22 +0000 (16:29 +0000)]
am
ee35410f: (-s ours) am
a7501119: am
69b8e962: Make Bitmap_createFromParcel check the color count. DO NOT MERGE
* commit '
ee35410ff8297b1ab39f3e546ebcedc27300a7de':
Make Bitmap_createFromParcel check the color count. DO NOT MERGE
Leon Scroggins III [Thu, 23 Apr 2015 16:20:02 +0000 (16:20 +0000)]
am
a7501119: am
69b8e962: Make Bitmap_createFromParcel check the color count. DO NOT MERGE
* commit '
a7501119e341626536ce12c3539c2f9a986a2945':
Make Bitmap_createFromParcel check the color count. DO NOT MERGE
Leon Scroggins III [Thu, 23 Apr 2015 15:53:24 +0000 (15:53 +0000)]
am
4a6ca672: Make Bitmap_createFromParcel check the color count. DO NOT MERGE
* commit '
4a6ca6724c789603626d74a8cc187365788a6cfd':
Make Bitmap_createFromParcel check the color count. DO NOT MERGE
Leon Scroggins III [Thu, 23 Apr 2015 15:48:12 +0000 (15:48 +0000)]
am
69b8e962: Make Bitmap_createFromParcel check the color count. DO NOT MERGE
* commit '
69b8e962e1b8346b33a2c14889547a0ac00c8b17':
Make Bitmap_createFromParcel check the color count. DO NOT MERGE
Leon Scroggins III [Wed, 11 Mar 2015 17:12:06 +0000 (13:12 -0400)]
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
Leon Scroggins III [Wed, 15 Apr 2015 12:16:29 +0000 (08:16 -0400)]
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: I9490d90244e051a4019d6266b2a1cb375a65198f
Deepanshu Gupta [Fri, 27 Mar 2015 01:02:58 +0000 (01:02 +0000)]
am
ec8df9af: Fix tests for Java 6.
* commit '
ec8df9af2f35eb5be4df01d66b1add4a4e7546c7':
Fix tests for Java 6.
Deepanshu Gupta [Thu, 26 Mar 2015 18:08:43 +0000 (11:08 -0700)]
Fix tests for Java 6.
- Change the guava version used to match the one included in the SDK.
The test server uses the same. However, the command line build still
uses the guava present at platform/external/guava, which is compiled
with Java 7. Thus, running the tests from inside the IDE can be done
via Java 6.
- Rebuilt the test app classes with Java 6 compatibility.
- Change similarity threshold to prevent differences due to some locale
settings different java versions.
Change-Id: Ic71d43256a8cf6f9df296e63550667a202c7105f
Michael Runge [Thu, 26 Mar 2015 03:57:33 +0000 (03:57 +0000)]
am
b0197033: Increase timeout when uncrypting OTA
* commit '
b019703395ae0304ddd10054843c64db87229d23':
Increase timeout when uncrypting OTA
Michael Runge [Wed, 17 Dec 2014 22:14:12 +0000 (14:14 -0800)]
Increase timeout when uncrypting OTA
Larger OTAs (750 MB tested) are taking 3-4 minutes
to write, due to the O_SYNC needed to ensure that
the data is actually committed to disk prior to
reboot.
Bug:
18750317
Change-Id: Idfab3ffd0276df4548f69a09c72ad6f4a344b6e6
(cherry picked from commit
01c06dfb076b71cb72c4bff9175bec9d59d2efde)
Deepanshu Gupta [Tue, 24 Mar 2015 23:55:18 +0000 (23:55 +0000)]
am
e541f350: Merge "Update JRE for runConfigurations." into lmp-dev
* commit '
e541f35055709ec43407649b8517639ff00e42d6':
Update JRE for runConfigurations.
Deepanshu Gupta [Tue, 24 Mar 2015 23:55:14 +0000 (23:55 +0000)]
am
6f5fac81: Merge "Fix project settings. [DO NOT MERGE]" into lmp-dev
* commit '
6f5fac817abee63d9211e8e43646196950c43707':
Fix project settings. [DO NOT MERGE]
Deepanshu Gupta [Tue, 24 Mar 2015 23:55:10 +0000 (23:55 +0000)]
am
44fea603: Merge "Fix RoundRect radius." into lmp-dev
* commit '
44fea60376e4e851b07eb365fd581c5b9404611f':
Fix RoundRect radius.
Deepanshu Gupta [Tue, 24 Mar 2015 23:55:06 +0000 (23:55 +0000)]
am
3bd5cbb1: Merge "Use right colors for status bar and nav bar." into lmp-dev
* commit '
3bd5cbb1f3d837d7799fb4b33b4dda99adbeeeb4':
Use right colors for status bar and nav bar.