OSDN Git Service
Charles He [Thu, 29 Dec 2016 09:50:26 +0000 (09:50 +0000)]
Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev
am:
63a27d773b
Change-Id: I01d332678c1c3fe57ed36062a9ed01b5f368a55d
Charles He [Thu, 29 Dec 2016 09:50:20 +0000 (09:50 +0000)]
Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable.
am:
71d2a41dd9
Change-Id: Iab575b1efdd720c9cf9e32e0b056c99eff98deab
Charles He [Thu, 29 Dec 2016 09:48:50 +0000 (09:48 +0000)]
Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev
am:
4bd97eb888
Change-Id: I607f7ca9e160c4eed69a5baeff6b31d6db7c6b03
Charles He [Thu, 29 Dec 2016 09:48:45 +0000 (09:48 +0000)]
Prevent writing to FRP partition during factory reset.
am:
a9437bd1ca
Change-Id: Ib0b8db2357317dc3e680910c08f15f098baf2af9
Charles He [Thu, 29 Dec 2016 09:43:10 +0000 (09:43 +0000)]
Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev
Charles He [Thu, 29 Dec 2016 09:42:25 +0000 (09:42 +0000)]
Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev
Tom O'Neill [Thu, 22 Dec 2016 17:19:10 +0000 (17:19 +0000)]
Fix exploit where can hide the fact that a location was mocked am:
a206a0f17e am:
d417e54872 am:
3380a77516 am:
0a8978f04b
am:
1684e5f344
Change-Id: I0ebd2856e2e2f3793273ba952b44dc77e85b021e
Tom O'Neill [Thu, 22 Dec 2016 17:14:05 +0000 (17:14 +0000)]
Fix exploit where can hide the fact that a location was mocked am:
a206a0f17e am:
d417e54872 am:
3380a77516
am:
0a8978f04b
Change-Id: I693665a57465ec57f946fad57cda9ce48389408f
Tom O'Neill [Thu, 22 Dec 2016 17:09:09 +0000 (17:09 +0000)]
Fix exploit where can hide the fact that a location was mocked am:
a206a0f17e am:
d417e54872
am:
3380a77516
Change-Id: Ice61f337e1fcfd0569431538e475d94f9d205423
Tom O'Neill [Thu, 22 Dec 2016 17:04:07 +0000 (17:04 +0000)]
Fix exploit where can hide the fact that a location was mocked am:
a206a0f17e
am:
d417e54872
Change-Id: I2f47020055f962b36f095137d75c9cbfe6b1a6db
Tom O'Neill [Thu, 22 Dec 2016 16:58:33 +0000 (16:58 +0000)]
Fix exploit where can hide the fact that a location was mocked
am:
a206a0f17e
Change-Id: Ib3af056919a4b909d3d11dd3fe2b46eaa7cdf0f4
Tom O'Neill [Thu, 15 Dec 2016 18:26:28 +0000 (10:26 -0800)]
Fix exploit where can hide the fact that a location was mocked
- Even if call setTestProviderLocation() with inconsistent providers,
should still end up with a location that is flagged as mocked
- Bug:
33091107
Change-Id: I39e038f25b975989c2e8651bfd9ec9e74073e6cd
Charles He [Thu, 1 Dec 2016 19:22:33 +0000 (19:22 +0000)]
Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable.
Change-Id: I1024f2a56badde5c123d025d6fe02f42559cbcb1
Test: manual
Bug:
30352311
(cherry picked from commit
f6f1d627483b4dad9d65176769a1ee92c59a4810)
Charles He [Thu, 24 Nov 2016 14:05:00 +0000 (14:05 +0000)]
Prevent writing to FRP partition during factory reset.
Avoid potential race condition between FRP wipe and write operations
during factory reset by making the FRP partition unwritable after
wipe.
Bug:
30352311
Test: manual
Change-Id: If3f024a1611366c0677a996705724458094fcfad
(cherry picked from commit
a629c772f4a7a5ddf7ff9f78fb19f7ab86c2a9c2)
Jeff Sharkey [Fri, 2 Dec 2016 18:30:18 +0000 (18:30 +0000)]
Merge "DO NOT MERGE. Check provider access for content changes." into lmp-dev am:
ae7d4b1339 -s ours
am:
ce477912a2
Change-Id: I1f05c5204e6ba49a95a8b21cb457b04fe6738cb0
Jeff Sharkey [Fri, 2 Dec 2016 18:29:19 +0000 (18:29 +0000)]
DO NOT MERGE. Check provider access for content changes. am:
9b85862620 -s ours
am:
9277cce7fa
Change-Id: I5cdc35759ad40566c02db6ee725c199ae255b5b8
Jeff Sharkey [Fri, 2 Dec 2016 18:19:56 +0000 (18:19 +0000)]
Merge "DO NOT MERGE. Check provider access for content changes." into lmp-mr1-dev
am:
6b89229d14
Change-Id: I8f09aaed1be7f86cfb0a2cbe91ae5b4fe881df07
Jeff Sharkey [Fri, 2 Dec 2016 18:19:53 +0000 (18:19 +0000)]
Merge "DO NOT MERGE. Check provider access for content changes." into lmp-dev
am:
ae7d4b1339 -s ours
Change-Id: Idc5d7d7d695db9ac7e7007447c89ca0466ea158b
Jeff Sharkey [Fri, 2 Dec 2016 18:19:51 +0000 (18:19 +0000)]
DO NOT MERGE. Check provider access for content changes.
am:
91add43ae7
Change-Id: I158a5dab0643fb5d2c07393f0df030e93b3c006a
Jeff Sharkey [Fri, 2 Dec 2016 18:19:50 +0000 (18:19 +0000)]
DO NOT MERGE. Check provider access for content changes.
am:
9b85862620 -s ours
Change-Id: I2a67bbde8b3e131ba62cedd0b6629912e226ba90
Jeff Sharkey [Fri, 2 Dec 2016 18:10:04 +0000 (18:10 +0000)]
Merge "DO NOT MERGE. Check provider access for content changes." into lmp-mr1-dev
Jeff Sharkey [Fri, 2 Dec 2016 18:10:04 +0000 (18:10 +0000)]
Merge "DO NOT MERGE. Check provider access for content changes." into lmp-dev
Jeff Sharkey [Fri, 2 Dec 2016 00:56:32 +0000 (00:56 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
f279a5bc0d -s ours
am:
704085119d
Change-Id: Ic687581a9bf5f0906cdb7642e59b81d9b6175aca
Jeff Sharkey [Fri, 2 Dec 2016 00:50:29 +0000 (00:50 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing.
am:
1de465bec2
Change-Id: I14f82fa9c555bea0e71553713436a6836a421691
Jeff Sharkey [Fri, 2 Dec 2016 00:50:27 +0000 (00:50 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing.
am:
f279a5bc0d -s ours
Change-Id: I7fde8a3cd529bc495aa7e886988d73e22815c0b4
Jeff Sharkey [Wed, 30 Nov 2016 23:07:00 +0000 (16:07 -0700)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing.
As part of fixing a recent security issue, DownloadManager now needs
to issue Uri permission grants for all downloads. However, if an app
that requested a download is upgraded or otherwise force-stopped,
the required permission grants are removed.
We could tell DownloadManager about the app being stopped, but that
would be racy (due to background broadcast), and waking it up would
degrade system health. Instead, as a special case we now only
consider clearing DownloadManager permission grants when app data
is being cleared.
Bug:
32172542,
30537115
Test: builds, boots, app upgrade doesn't clear grants
Change-Id: I7e3d4546fd12bfe5f81b9fb9857ece58d574a6b9
(cherry picked from commit
23ec811266fb728cf159a90ce4882b3c9bac1887)
Jeff Sharkey [Wed, 30 Nov 2016 23:07:00 +0000 (16:07 -0700)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing.
As part of fixing a recent security issue, DownloadManager now needs
to issue Uri permission grants for all downloads. However, if an app
that requested a download is upgraded or otherwise force-stopped,
the required permission grants are removed.
We could tell DownloadManager about the app being stopped, but that
would be racy (due to background broadcast), and waking it up would
degrade system health. Instead, as a special case we now only
consider clearing DownloadManager permission grants when app data
is being cleared.
Bug:
32172542,
30537115
Test: builds, boots, app upgrade doesn't clear grants
Change-Id: I7e3d4546fd12bfe5f81b9fb9857ece58d574a6b9
(cherry picked from commit
23ec811266fb728cf159a90ce4882b3c9bac1887)
Jeff Sharkey [Fri, 18 Nov 2016 22:31:22 +0000 (15:31 -0700)]
DO NOT MERGE. Check provider access for content changes.
For an app to either send or receive content change notifications,
require that they have some level of access to the underlying
provider.
Without these checks, a malicious app could sniff sensitive user data
from the notifications of otherwise private providers.
Test: builds, boots, PoC app now fails
Bug:
32555637
Change-Id: If2dcd45cb0a9f1fb3b93e39fc7b8ae9c34c2fdef
Jeff Sharkey [Fri, 18 Nov 2016 21:23:23 +0000 (14:23 -0700)]
DO NOT MERGE. Check provider access for content changes.
For an app to either send or receive content change notifications,
require that they have some level of access to the underlying
provider.
Without these checks, a malicious app could sniff sensitive user data
from the notifications of otherwise private providers.
Test: builds, boots, PoC app now fails
Bug:
32555637
Change-Id: If2dcd45cb0a9f1fb3b93e39fc7b8ae9c34c2fdef
Narayan Kamath [Thu, 10 Nov 2016 11:12:11 +0000 (11:12 +0000)]
Zygote : Block SIGCHLD during fork. am:
b1f1209d9a
am:
35b8453338
Change-Id: I7c73b1a37d79f31ad8fff6d0b83426debbfd88f9
Narayan Kamath [Thu, 10 Nov 2016 11:05:42 +0000 (11:05 +0000)]
Zygote : Block SIGCHLD during fork.
am:
b1f1209d9a
Change-Id: I3658f583c82dd6243089aaa74ad731a5bfa85b01
Narayan Kamath [Mon, 7 Nov 2016 16:22:48 +0000 (16:22 +0000)]
Zygote : Block SIGCHLD during fork.
We close the android logging related sockets prior as late as possible
before every fork to avoid having to whitelist them. If one of the
zygote's children dies after this point (but prior to the fork), we can
end up reopening the logging sockets from the SIGCHLD signal handler.
To prevent this from happening, block SIGCHLD during this critical
section.
Bug:
32693692
Test: Manual
(cherry picked from commit
e9a525829a354c92983a35455ccab16d1b0d3892)
Zygote: Unblock SIGCHLD in the parent after fork.
Follow up to change
e9a525829a354c92983a. Allows the zygote to
receive SIGCHLD again and prevents the zygote from getting into a
zombie state if it's killed.
Contributed-By: rhed_jao <rhed_jao@htc.com>
Bug:
32693692
Test: manual
(cherry picked from commit
1480dc3e97b661f5bfa3a5c2fbce72385b8d2be6)
Change-Id: If89903a29c84dfc9b056f9e19618046874bba689
Narayan Kamath [Wed, 9 Nov 2016 20:17:01 +0000 (20:17 +0000)]
Merge "Zygote: Additional whitelisting for legacy devices." into lmp-dev am:
7bd25ab485
am:
a045aed7a2
Change-Id: Iec015c0607286511a0d82db7fd6c82f6e17379aa
Narayan Kamath [Wed, 9 Nov 2016 20:16:06 +0000 (20:16 +0000)]
Zygote: Additional whitelisting for legacy devices. am:
7d302e018d
am:
f369b3ce75
Change-Id: Id0794434479585b2cf4b4996256a3cb9374fd9a7
Narayan Kamath [Wed, 9 Nov 2016 20:15:05 +0000 (20:15 +0000)]
Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into lmp-dev am:
d60156dfc6
am:
fd23b9d509
Change-Id: I86ad3b0fe5c3da67014540c1aa35c4326ee4f33b
Narayan Kamath [Wed, 9 Nov 2016 20:14:07 +0000 (20:14 +0000)]
Zygote: Additional whitelists for runtime overlay / other static resources. am:
0ad0e859f6
am:
1e6a5d11a6
Change-Id: Ia98abb9cb437dd3c42b80de5c0cd98c965e6603e
neo.chae [Wed, 9 Nov 2016 20:13:07 +0000 (20:13 +0000)]
Fix idmap leak in zygote process am:
0244ca8d10
am:
82537abc3b
Change-Id: I83d338ebfdefd0f935c4cfb14c3b15efca1cce0f
Xin Li [Wed, 9 Nov 2016 20:11:44 +0000 (20:11 +0000)]
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into lollipop-mr1-dev" into lmp-mr1-dev." into lmp-mr1-dev
am:
78f15948fb
Change-Id: I5f5509cd98a6a98ce9edc782e9d8ef9093fa86e4
Xin Li [Wed, 9 Nov 2016 20:11:40 +0000 (20:11 +0000)]
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into lollipop-mr1-dev" into lmp-mr1-dev.
am:
7e0483fcec -s ours
Change-Id: I3a351771548f827aeecf9a4c8305b907c106abc5
Narayan Kamath [Wed, 9 Nov 2016 10:24:57 +0000 (10:24 +0000)]
Merge "Zygote: Additional whitelisting for legacy devices." into lmp-dev
am:
7bd25ab485
Change-Id: I0266e2fe129ac5ae0c7bbd84e7890d5c41872655
Narayan Kamath [Wed, 9 Nov 2016 10:24:53 +0000 (10:24 +0000)]
Zygote: Additional whitelisting for legacy devices.
am:
7d302e018d
Change-Id: I15f8e0ec93f502ca45a9b00d93baa66780701996
Narayan Kamath [Wed, 9 Nov 2016 10:20:00 +0000 (10:20 +0000)]
Merge "Zygote: Additional whitelisting for legacy devices." into lmp-dev
Narayan Kamath [Wed, 9 Nov 2016 09:39:23 +0000 (09:39 +0000)]
Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into lmp-dev
am:
d60156dfc6
Change-Id: I3696ed3639492ae446ccd1c9ad4feaaa9e15a5ef
Narayan Kamath [Wed, 9 Nov 2016 09:39:20 +0000 (09:39 +0000)]
Zygote: Additional whitelists for runtime overlay / other static resources.
am:
0ad0e859f6
Change-Id: Id24798deebb738ba6c6b6abef28ca96c0c61dc79
Narayan Kamath [Wed, 9 Nov 2016 09:30:47 +0000 (09:30 +0000)]
Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into lmp-dev
neo.chae [Wed, 9 Nov 2016 09:21:46 +0000 (09:21 +0000)]
Fix idmap leak in zygote process
am:
0244ca8d10
Change-Id: Ia35ded23161ad5c5c6fe4dea388e74b8d8af2955
Xin Li [Tue, 8 Nov 2016 21:24:12 +0000 (21:24 +0000)]
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into lollipop-mr1-dev" into lmp-mr1-dev." into lmp-mr1-dev
neo.chae [Mon, 31 Oct 2016 15:02:38 +0000 (00:02 +0900)]
Fix idmap leak in zygote process
Fix a idmap leak in AssetManager::addSystemOverlays.
And, The fix could also prevent fd leak of idmap.
Test: none
Bug:
32691930
Signed-off-by: Hyangseok Chae <neo.chae@lge.com>
(cherry picked from commit
6a742a38509693f8b39ee9a5ad2803fca12688bf)
Change-Id: Idc4af77db2b0cb739bd6b009b6af0f9123be1aac
Narayan Kamath [Mon, 7 Nov 2016 19:59:29 +0000 (19:59 +0000)]
Zygote: Additional whitelisting for legacy devices.
On M and below, we provide a blanket whitelist for all files under
"/vendor/zygote_whitelist". This path is whitelisted purely to allow
this patch to be applied easily on legacy devices and configurations.
Note that this does not amount to a loosening of our security policy
because whitelisted files are reopened anyway.
Bug:
32691930
Test: manual
(cherry picked from commit
5e2f7c6229d7191183888d685b57a7d0a2835fce)
Change-Id: I9700fc7b469d0bc4d876c52292f25888b94a5223
Narayan Kamath [Fri, 23 Sep 2016 08:07:11 +0000 (09:07 +0100)]
Zygote: Additional whitelists for runtime overlay / other static resources.
Partially cherry picked from commit
1c15c635785c64a.
These files are safe to reopen for the same reason that files in
/system/framework are. They're regular files and will not change after
the first zygote fork.
Bug:
32618130
Change-Id: I119e0bfcbf397cb331064adf148d92a5cd3ea92f
Sungsoo [Tue, 18 Oct 2016 17:54:57 +0000 (17:54 +0000)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens am:
418e0869ba am:
a5affb045e am:
9a15881184 -s ours am:
21c4e6d532 -s ours
am:
ec44540d42
Change-Id: Id4fd3422c443d5e7363d3ff27b2ba0eeb532f1dd
Sungsoo [Tue, 18 Oct 2016 17:47:58 +0000 (17:47 +0000)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens am:
418e0869ba am:
a5affb045e am:
9a15881184 -s ours
am:
21c4e6d532 -s ours
Change-Id: Ibf02e62ee13accd5d204c44faeb6aa8c05afb709
Sungsoo [Tue, 18 Oct 2016 17:41:55 +0000 (17:41 +0000)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens am:
418e0869ba am:
a5affb045e
am:
9a15881184 -s ours
Change-Id: I67ba2d8b8d3c3f32fca417303ee422482acc40d8
Sungsoo [Tue, 18 Oct 2016 17:35:23 +0000 (17:35 +0000)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens am:
418e0869ba
am:
a5affb045e
Change-Id: I4bb4440c019839073b4fcf6df54d726a02286680
Sungsoo [Tue, 18 Oct 2016 17:35:16 +0000 (17:35 +0000)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens am:
135524f2c5 -s ours
am:
02cd808ab8
Change-Id: Ic14a5adecb6fb0732a5b3c2a68a28fdcf1eb1bc4
Sungsoo [Tue, 18 Oct 2016 17:29:03 +0000 (17:29 +0000)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens
am:
135524f2c5 -s ours
Change-Id: I34fc1b37171ad6ea5d79035df6c4730260a0b47b
Sungsoo [Tue, 18 Oct 2016 17:28:58 +0000 (17:28 +0000)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens
am:
418e0869ba
Change-Id: Ifad08d681f67abc4dd9ad5d8c4e82b038cbd8322
Sungsoo [Tue, 18 Oct 2016 17:28:58 +0000 (17:28 +0000)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens
am:
ad74e88f1d
Change-Id: Ic8a6e5b579c028a560436cdc6c3ca68a51cbf229
Sungsoo [Tue, 18 Oct 2016 05:12:00 +0000 (14:12 +0900)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens
Bug:
32068647, Bug:
30936376
Change-Id: I22fa2384348c890ca726d2b1632cd54e59d25a8f
Sungsoo [Tue, 18 Oct 2016 05:12:00 +0000 (14:12 +0900)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens
Bug:
32068647, Bug:
30936376
Change-Id: I22fa2384348c890ca726d2b1632cd54e59d25a8f
Sungsoo [Tue, 18 Oct 2016 05:12:00 +0000 (14:12 +0900)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens
Bug:
32068647, Bug:
30936376
Change-Id: I22fa2384348c890ca726d2b1632cd54e59d25a8f
Suprabh Shukla [Sat, 15 Oct 2016 01:10:15 +0000 (01:10 +0000)]
Merge "DO NOT MERGE Isolated processes don't get precached system service binders" into klp-dev am:
6739ba0280 am:
c36913e68a am:
e3c0c509ea -s ours am:
5bea7d3aee -s ours
am:
0eef6b3ff2
Change-Id: Ia5e16b194bb3af63506557c88ef2f5077dc58000
Suprabh Shukla [Sat, 15 Oct 2016 01:04:39 +0000 (01:04 +0000)]
DO NOT MERGE Isolated processes don't get precached system service binders am:
2aa7e5e861 am:
9df66924c0 am:
e07b811d78 -s ours am:
9c78d0ad9f -s ours
am:
7dfd05f0e5
Change-Id: Icfcde7dc91379a4e69d688501a0c46797b212103
Suprabh Shukla [Sat, 15 Oct 2016 00:59:41 +0000 (00:59 +0000)]
Merge "DO NOT MERGE Isolated processes don't get precached system service binders" into klp-dev am:
6739ba0280 am:
c36913e68a am:
e3c0c509ea -s ours
am:
5bea7d3aee -s ours
Change-Id: If66e50ff4d2f4c1b91ed3204d7a11000429489d5
Suprabh Shukla [Sat, 15 Oct 2016 00:56:40 +0000 (00:56 +0000)]
DO NOT MERGE Isolated processes don't get precached system service binders am:
2aa7e5e861 am:
9df66924c0 am:
e07b811d78 -s ours
am:
9c78d0ad9f -s ours
Change-Id: I6e82648a135bd8ae17337eb97518eb8856d065e0
Suprabh Shukla [Sat, 15 Oct 2016 00:49:46 +0000 (00:49 +0000)]
Merge "DO NOT MERGE Isolated processes don't get precached system service binders" into klp-dev am:
6739ba0280 am:
c36913e68a
am:
e3c0c509ea -s ours
Change-Id: I287e60913bd2a3f6b46d1d5ef2413727e3e63cc2
Suprabh Shukla [Sat, 15 Oct 2016 00:48:51 +0000 (00:48 +0000)]
DO NOT MERGE Isolated processes don't get precached system service binders am:
2aa7e5e861 am:
9df66924c0
am:
e07b811d78 -s ours
Change-Id: Ia9271aeed1c2953a318fc4bf50ee169739147d66
Suprabh Shukla [Sat, 15 Oct 2016 00:41:36 +0000 (00:41 +0000)]
Merge "DO NOT MERGE Isolated processes don't get precached system service binders" into klp-dev am:
6739ba0280
am:
c36913e68a
Change-Id: I65ab1551a4cdbbdf58bf9ec98f718e79c6ee9fe5
Suprabh Shukla [Sat, 15 Oct 2016 00:40:45 +0000 (00:40 +0000)]
DO NOT MERGE Isolated processes don't get precached system service binders am:
2aa7e5e861
am:
9df66924c0
Change-Id: I9bd2580a687037fe9c5d74765d47bb4500b4d096
Suprabh Shukla [Sat, 15 Oct 2016 00:38:27 +0000 (00:38 +0000)]
Merge "DO NOT MERGE Isolated processes don't get precached system service binders" into lmp-dev am:
35bd0fc5f0 -s ours
am:
40a13c5917
Change-Id: I15dbea28f9afc052060eb802340f745ad82a7281
Suprabh Shukla [Sat, 15 Oct 2016 00:37:25 +0000 (00:37 +0000)]
DO NOT MERGE Isolated processes don't get precached system service binders am:
4779ee70a2 -s ours
am:
8d124e37f1
Change-Id: I59ee9b64743d128b3d9262b38897e84b1ed64b56
Suprabh Shukla [Sat, 15 Oct 2016 00:34:11 +0000 (00:34 +0000)]
Merge "DO NOT MERGE Isolated processes don't get precached system service binders" into klp-dev
am:
6739ba0280
Change-Id: Ib8534d2c7ae344d430a9ba2e227cb65d942f0222
Suprabh Shukla [Sat, 15 Oct 2016 00:34:09 +0000 (00:34 +0000)]
DO NOT MERGE Isolated processes don't get precached system service binders
am:
2aa7e5e861
Change-Id: Ied81e1f4b517627f0ced686e7485fa035b1f4c6a
Suprabh Shukla [Sat, 15 Oct 2016 00:34:06 +0000 (00:34 +0000)]
Merge "DO NOT MERGE Isolated processes don't get precached system service binders" into lmp-dev
am:
35bd0fc5f0 -s ours
Change-Id: I852b990d1715782f3332d56bba6f08b72da403c6
Suprabh Shukla [Sat, 15 Oct 2016 00:34:04 +0000 (00:34 +0000)]
DO NOT MERGE Isolated processes don't get precached system service binders
am:
4779ee70a2 -s ours
Change-Id: Ie4aef1642ca6f23d78e732f27455ebd087866121
Christopher Tate [Sat, 15 Oct 2016 00:33:36 +0000 (00:33 +0000)]
DO NOT MERGE Isolated processes don't get precached system service binders
am:
190e66685f
Change-Id: I0ed530e9909811e592f966a44f41400a0146c5b6
Suprabh Shukla [Sat, 15 Oct 2016 00:26:18 +0000 (00:26 +0000)]
Merge "DO NOT MERGE Isolated processes don't get precached system service binders" into lmp-dev
TreeHugger Robot [Sat, 15 Oct 2016 00:24:31 +0000 (00:24 +0000)]
Merge "DO NOT MERGE Isolated processes don't get precached system service binders" into klp-dev
Suprabh Shukla [Thu, 13 Oct 2016 02:01:11 +0000 (19:01 -0700)]
DO NOT MERGE Isolated processes don't get precached system service binders
More specifically, they get a PackageManager binder -- necessary for
Android process startup and configuration -- but none of the other
usual preloaded service binders.
(backported from commit
2c61c57ac53cbb270b4e76b9d04465f8a3f6eadc)
Bug:
30202228
Change-Id: I3810649f504cd631665ece338a83d2e54d41ad05
Suprabh Shukla [Thu, 13 Oct 2016 23:33:04 +0000 (16:33 -0700)]
DO NOT MERGE Isolated processes don't get precached system service binders
More specifically, they get a PackageManager binder -- necessary for
Android process startup and configuration -- but none of the other
usual preloaded service binders.
(backported from commit
2c61c57ac53cbb270b4e76b9d04465f8a3f6eadc)
Bug:
30202228
Change-Id: I3810649f504cd631665ece338a83d2e54d41ad05
Christopher Tate [Tue, 16 Aug 2016 23:03:44 +0000 (16:03 -0700)]
DO NOT MERGE Isolated processes don't get precached system service binders
More specifically, they get a PackageManager binder -- necessary for
Android process startup and configuration -- but none of the other
usual preloaded service binders.
Bug
30202228
Change-Id: I3810649f504cd631665ece338a83d2e54d41ad05
(cherry picked from commit
2c61c57ac53cbb270b4e76b9d04465f8a3f6eadc)
Sungsoo [Thu, 13 Oct 2016 22:18:36 +0000 (22:18 +0000)]
DO NOT MERGE) ExifInterface: Provide backward compatibility am:
c11f599a2f am:
29e643bcbd am:
68aa33b9bf -s ours am:
2a762996cb -s ours
am:
a8d06257c1
Change-Id: I5f25f766a472bfddc32aa7ab7e506bc5e5d6854b
Sungsoo [Thu, 13 Oct 2016 22:12:03 +0000 (22:12 +0000)]
DO NOT MERGE) ExifInterface: Provide backward compatibility am:
c11f599a2f am:
29e643bcbd am:
68aa33b9bf -s ours
am:
2a762996cb -s ours
Change-Id: If32418debc774a2f78eae4cc2b3f5b77457bfa1c
Sungsoo [Thu, 13 Oct 2016 22:06:03 +0000 (22:06 +0000)]
DO NOT MERGE) ExifInterface: Provide backward compatibility am:
c11f599a2f am:
29e643bcbd
am:
68aa33b9bf -s ours
Change-Id: I7fe3d5dbcb7bd206233ce969840f5ed182913dd6
Sungsoo [Thu, 13 Oct 2016 22:01:39 +0000 (22:01 +0000)]
DO NOT MERGE) ExifInterface: Provide backward compatibility am:
c11f599a2f
am:
29e643bcbd
Change-Id: I413ba35abfc8999c405df78a40b8182f19472b6a
Sungsoo [Thu, 13 Oct 2016 22:00:51 +0000 (22:00 +0000)]
DO NOT MERGE) ExifInterface: Provide backward compatibility am:
22bd36448e -s ours
am:
3992742559
Change-Id: I0b7cbc29fa69ff1170e377bd51621c5a5e14f793
Sungsoo [Thu, 13 Oct 2016 21:57:01 +0000 (21:57 +0000)]
DO NOT MERGE) ExifInterface: Provide backward compatibility
am:
22bd36448e -s ours
Change-Id: I13a49444b80cd07c0cb37f6b8fb514b5b04e61bb
Sungsoo [Thu, 13 Oct 2016 21:56:56 +0000 (21:56 +0000)]
DO NOT MERGE) ExifInterface: Provide backward compatibility
am:
c11f599a2f
Change-Id: If503e3361e69ad88a166f145603273d728d65652
Sungsoo [Thu, 13 Oct 2016 21:54:25 +0000 (21:54 +0000)]
DO NOT MERGE) ExifInterface: Provide backward compatibility
am:
87a9ac70c3
Change-Id: I6639c6763ee1f7d83d03cc6d5fa11cbf1516e7cc
Xin Li [Thu, 13 Oct 2016 20:54:13 +0000 (13:54 -0700)]
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into
lollipop-mr1-dev" into lmp-mr1-dev.
Change-Id: Ia47211f647d0d49b0adf3cb65eba4b9b686bcbff
Sungsoo [Thu, 13 Oct 2016 03:24:16 +0000 (12:24 +0900)]
DO NOT MERGE) ExifInterface: Provide backward compatibility
ExifInterface.saveAttribute() didn't throw UnsupportedOperationException
before. Use IOException instead of UnsupportedOperationException for
backward compatibility.
Bug:
30936376, Bug:
32068647, Bug:
31319086
Change-Id: Iacc7b4d91d49edd7bece8f2e738a633a91025eca
Sungsoo [Thu, 13 Oct 2016 03:24:16 +0000 (12:24 +0900)]
DO NOT MERGE) ExifInterface: Provide backward compatibility
ExifInterface.saveAttribute() didn't throw UnsupportedOperationException
before. Use IOException instead of UnsupportedOperationException for
backward compatibility.
Bug:
30936376, Bug:
32068647, Bug:
31319086
Change-Id: Iacc7b4d91d49edd7bece8f2e738a633a91025eca
Sungsoo [Thu, 13 Oct 2016 03:24:16 +0000 (12:24 +0900)]
DO NOT MERGE) ExifInterface: Provide backward compatibility
ExifInterface.saveAttribute() didn't throw UnsupportedOperationException
before. Use IOException instead of UnsupportedOperationException for
backward compatibility.
Bug:
30936376, Bug:
32068647, Bug:
31319086
Change-Id: Iacc7b4d91d49edd7bece8f2e738a633a91025eca
Treehugger Robot [Thu, 13 Oct 2016 00:45:58 +0000 (00:45 +0000)]
Merge "DO NOT MERGE - Added translations for emergency action string" into lollipop-mr1-dev
Treehugger Robot [Thu, 13 Oct 2016 00:44:41 +0000 (00:44 +0000)]
Merge "DO NOT MERGE - Fixed an issue where the emergency affordance would show" into lollipop-mr1-dev
Selim Cinek [Tue, 11 Oct 2016 23:45:41 +0000 (16:45 -0700)]
DO NOT MERGE - Added translations for emergency action string
Bug:
30404490
Change-Id: Ic20d93005882bb71cef32a705443e427b0a9bd71
Selim Cinek [Tue, 11 Oct 2016 19:49:48 +0000 (12:49 -0700)]
DO NOT MERGE - Fixed an issue where the emergency affordance would show
If a device isn't voice capable, it shouldn't show the emergency
option.
Test: use tablet which isn't voice capable, insert indian sim and
make sure no emergency option is displayed in global actions.
Bug:
31953703
Change-Id: I351e87320f3ffec76d1c1fc5aac78e5c48c0ac54
Treehugger Robot [Mon, 10 Oct 2016 20:41:55 +0000 (20:41 +0000)]
Merge "DO NOT MERGE - Added Emergency affordance feature" into lollipop-mr1-dev
Selim Cinek [Tue, 13 Sep 2016 23:02:33 +0000 (16:02 -0700)]
DO NOT MERGE - Added Emergency affordance feature
Added a service that listens whether emergency affordances
are necessary.
If the they are needed, it adds an option to the
global actions dialog that directly launches the
emergency call and also adds a long-press listener
to the keyguard emergency button.
Test: adb shell settings put global force_emergency_affordance 1 && adb shell settings put global emergency_affordance_number 111112
Bug:
30404490
Change-Id: Ib96a15da2ef4b568a8d77140ebca6aa6f20f5ddb
Jaewan Kim [Thu, 22 Sep 2016 20:05:49 +0000 (20:05 +0000)]
Merge "DO NOT MERGE Fix build" into lmp-dev am:
fce3b76452 -s ours
am:
ded4df2e79
Change-Id: I16dd5912ae18ae4f25bdd9a8e2fa7d07ca8f1b61