OSDN Git Service
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 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: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 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: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: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 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 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: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
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: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 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
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 18:09:45 +0000 (18:09 +0000)]
Merge "DO NOT MERGE Fix build" into lmp-dev
am:
fce3b76452 -s ours
Change-Id: Iea1a397f79856070d5f801193c71721a8ff69936
Jaewan Kim [Thu, 22 Sep 2016 18:09:41 +0000 (18:09 +0000)]
DO NOT MERGE Fix build
am:
dfedca4e43 -s ours
Change-Id: Ibf95b4c061129b2cd047e3b8a8da9f90cfea7e8f
Jaewan Kim [Thu, 22 Sep 2016 17:46:56 +0000 (17:46 +0000)]
Merge "DO NOT MERGE Fix build" into lmp-dev
Jaewan Kim [Thu, 22 Sep 2016 05:56:33 +0000 (14:56 +0900)]
DO NOT MERGE Fix build
Bug:
29833954
Change-Id: Ia814969b516ac7cc0ad7431ebab40cc74fdf2a05
Jaewan Kim [Thu, 22 Sep 2016 09:38:16 +0000 (09:38 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to telephony service" into klp-dev am:
5b05226586 am:
b38fbf9894 am:
84ecab6059 -s ours
am:
5ac79fa0a1 -s ours
Change-Id: I02b22b773537b4c37893114f85714c32de5035a2
Jaewan Kim [Thu, 22 Sep 2016 09:13:35 +0000 (09:13 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to telephony service" into klp-dev am:
5b05226586 am:
b38fbf9894
am:
84ecab6059 -s ours
Change-Id: I077206cbba5614e52046cbbbf6e40544c3e25f92
Jaewan Kim [Thu, 22 Sep 2016 09:13:22 +0000 (09:13 +0000)]
DO NOT MERGE Check caller for sending media key to telephony service am:
d1641e8c27 am:
9477c1674c am:
27d24e01cb -s ours
am:
8dffbcd169 -s ours
Change-Id: Ida4217e4a0392c2f58b1ef3d0229bad4229c838d
Jaewan Kim [Thu, 22 Sep 2016 08:07:29 +0000 (08:07 +0000)]
DO NOT MERGE Check caller for sending media key to telephony service am:
d1641e8c27 am:
9477c1674c
am:
27d24e01cb -s ours
Change-Id: Ibfec9c02db97a94476d1b6b4d7e98fd051d4aa58
Jaewan Kim [Thu, 22 Sep 2016 08:07:17 +0000 (08:07 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to telephony service" into klp-dev am:
5b05226586
am:
b38fbf9894
Change-Id: I6f6d600544f09aac349a626e3ced18de5e02a2eb
Jaewan Kim [Thu, 22 Sep 2016 07:35:37 +0000 (07:35 +0000)]
DO NOT MERGE Check caller for sending media key to telephony service am:
d1641e8c27
am:
9477c1674c
Change-Id: If2edd8d386cd57f00221fedff3f118e6887cab61
Ajay Panicker [Thu, 22 Sep 2016 06:41:02 +0000 (06:41 +0000)]
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into klp-dev am:
c119a677c4 am:
35d1b45b0f am:
dc0f9fa9c9 -s ours
am:
8919cc83bb -s ours
Change-Id: I3370b5bb190ab5c7749e729fefdec33f06523899
Jaewan Kim [Thu, 22 Sep 2016 06:39:33 +0000 (06:39 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to telephony service" into klp-dev
am:
5b05226586
Change-Id: I0b0b672c42a7a4bd75ccbeb2c3a1047eebda5076
Jaewan Kim [Thu, 22 Sep 2016 06:39:24 +0000 (06:39 +0000)]
DO NOT MERGE Check caller for sending media key to telephony service
am:
d1641e8c27
Change-Id: I5be1d931c3a2f2748e69158d442172c327199ef5
Jaewan Kim [Thu, 22 Sep 2016 05:19:34 +0000 (05:19 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to telephony service" into klp-dev
Ajay Panicker [Thu, 22 Sep 2016 04:54:32 +0000 (04:54 +0000)]
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am:
786e2694b1 am:
8fd324c33f am:
438cc52ca1 -s ours
am:
7f84596929 -s ours
Change-Id: Ia1485d87e224d8fb870b50bc73f4ee6e93dd48e4
Jaewan Kim [Wed, 21 Sep 2016 02:20:54 +0000 (11:20 +0900)]
DO NOT MERGE Check caller for sending media key to telephony service
Prevent sending media key events from the non-system app to the
telephony service through the AudioManager.dispatchMediaKeyEvent()
or sending media key broadcast directly.
Bug:
29833954
Tested: Installed malicious apps and confirmed that they don't work.
Tested: Run CtsTelecomTestCases and CtsMediaTestCases
Change-Id: I2a9e78196ba7455324e485f098f095d03b47ee15
Ajay Panicker [Thu, 22 Sep 2016 03:50:02 +0000 (03:50 +0000)]
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into klp-dev am:
c119a677c4 am:
35d1b45b0f
am:
dc0f9fa9c9 -s ours
Change-Id: I75e0e5a61d15b2e6c4a1fec70b807165c8768987
Ajay Panicker [Thu, 22 Sep 2016 03:48:40 +0000 (03:48 +0000)]
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am:
786e2694b1 am:
8fd324c33f
am:
438cc52ca1 -s ours
Change-Id: Iabaa5642ffa6c3417b5e027e2da9b33666b1aacf
Jaewan Kim [Wed, 21 Sep 2016 22:53:42 +0000 (22:53 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into lmp-dev
am:
64b7b1522e -s ours
Change-Id: I1aaad42b1a3a82753aca4d55d743116cc3b674bd
Jaewan Kim [Wed, 21 Sep 2016 22:53:38 +0000 (22:53 +0000)]
DO NOT MERGE Check caller for sending media key to global priority session
am:
4e9af38ec4 -s ours
Change-Id: I416843909b0b49378d8b6dc4eb92032ae7a1418e
Jaewan Kim [Wed, 21 Sep 2016 22:21:03 +0000 (22:21 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into lmp-dev
Ajay Panicker [Wed, 21 Sep 2016 21:56:49 +0000 (21:56 +0000)]
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into klp-dev am:
c119a677c4
am:
35d1b45b0f
Change-Id: I0417ea58275604b9ac1fca6e79c14697d965397a
Ajay Panicker [Wed, 21 Sep 2016 21:55:46 +0000 (21:55 +0000)]
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am:
786e2694b1
am:
8fd324c33f
Change-Id: Idbe61150d738e5e41d5606fa6d89c0a5b604a86d
TreeHugger Robot [Wed, 21 Sep 2016 21:46:51 +0000 (21:46 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into lmp-mr1-dev
Ajay Panicker [Wed, 21 Sep 2016 21:15:59 +0000 (21:15 +0000)]
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into klp-dev
am:
c119a677c4
Change-Id: I7f1a7c5d09d38cfbd3fca0ee158f6401233e8f6d
Ajay Panicker [Wed, 21 Sep 2016 21:15:56 +0000 (21:15 +0000)]
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed
am:
786e2694b1
Change-Id: Ia40c3fc57b5c17910c67faf40b940bdd944dd4e3
Ajay Panicker [Wed, 21 Sep 2016 21:15:40 +0000 (21:15 +0000)]
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-dev
am:
f78ff48d0d -s ours
Change-Id: I82e447c8dbbabd40977805bc1d233de832296e6b
Ajay Panicker [Wed, 21 Sep 2016 21:15:37 +0000 (21:15 +0000)]
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed
am:
27b3d578b9 -s ours
Change-Id: Ia29f66f121813b3e03a16a665f7bdae2d75ed09b
Ajay Panicker [Wed, 21 Sep 2016 21:08:07 +0000 (21:08 +0000)]
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-mr1-dev
Ajay Panicker [Wed, 21 Sep 2016 21:08:04 +0000 (21:08 +0000)]
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-dev
Ajay Panicker [Wed, 21 Sep 2016 21:08:01 +0000 (21:08 +0000)]
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into klp-dev
Jaewan Kim [Wed, 21 Sep 2016 01:07:24 +0000 (10:07 +0900)]
DO NOT MERGE Check caller for sending media key to global priority session
Prevent sending media key events from the non-system app to the global
priority session through the MediaSessionManager.dispatchMediaKeyEvent().
Note that any app can use the API indirectly with
the public API AudioManager.dispatchMediaKeyEvent().
Bug:
29833954
Tested: Installed malicious apps and confirmed that they don't work.
Tested: Run CtsTelecomTestCases and CtsMediaTestCases
Change-Id: I2a9e78196ba7455324e485f098f095d03b47ee15
Jaewan Kim [Mon, 19 Sep 2016 12:19:55 +0000 (21:19 +0900)]
DO NOT MERGE Check caller for sending media key to global priority session
Prevent sending media key events from the non-system app to the global
priority session through the MediaSessionManager.dispatchMediaKeyEvent().
Note that any app can use the API indirectly with
the public API AudioManager.dispatchMediaKeyEvent().
Bug:
29833954
Tested: Installed malicious apps and confirmed that they don't work.
Tested: Run CtsTelecomTestCases and CtsMediaTestCases
Change-Id: I2a9e78196ba7455324e485f098f095d03b47ee15
TreeHugger Robot [Wed, 21 Sep 2016 00:52:46 +0000 (00:52 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-mr1-dev
Ajay Panicker [Wed, 21 Sep 2016 00:17:48 +0000 (00:17 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-dev
am:
19b09dd0d3 -s ours
Change-Id: Id030cd83f6759c255c1a5cfbea8b90a92610a02d
Ajay Panicker [Wed, 21 Sep 2016 00:13:03 +0000 (00:13 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)
am:
0ea21bc70e -s ours
Change-Id: I24d8a2df435e4df43cc39d0e0314796e53e30429
Ajay Panicker [Wed, 21 Sep 2016 00:12:20 +0000 (00:12 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into klp-dev am:
204da8aa9e am:
a278a1e660 am:
3d995d6f5f -s ours
am:
4f77ca16e4 -s ours
Change-Id: I6be29367b410ffc98e61d49450bb1d9905fbf3f8
Ajay Panicker [Wed, 21 Sep 2016 00:10:52 +0000 (00:10 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am:
edae39d59a am:
271e34dbd5 am:
3758253ae8 -s ours
am:
cb970f408e -s ours
Change-Id: I385bc1700aebf53fb2846a149995925dcb00b5e8
TreeHugger Robot [Wed, 21 Sep 2016 00:07:34 +0000 (00:07 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-dev
Ajay Panicker [Wed, 21 Sep 2016 00:04:35 +0000 (00:04 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into klp-dev am:
204da8aa9e am:
a278a1e660
am:
3d995d6f5f -s ours
Change-Id: I9e410ce2d5302eda87aea9628cb58ca203a212c5
Ajay Panicker [Wed, 21 Sep 2016 00:03:23 +0000 (00:03 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am:
edae39d59a am:
271e34dbd5
am:
3758253ae8 -s ours
Change-Id: I0836ddb1649084a6814c461bccc41135cb475337
Ajay Panicker [Tue, 20 Sep 2016 23:56:48 +0000 (23:56 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into klp-dev am:
204da8aa9e
am:
a278a1e660
Change-Id: I22838d21bdd289ca34b78260ade59adafbdc408a