OSDN Git Service
Narayan Kamath [Wed, 9 Nov 2016 11:26:09 +0000 (11:26 +0000)]
Merge "Zygote: Additional whitelisting for legacy devices." into mnc-dev
Narayan Kamath [Wed, 9 Nov 2016 09:45:32 +0000 (09:45 +0000)]
Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into mnc-dev
Hugo Benichi [Wed, 9 Nov 2016 02:24:41 +0000 (02:24 +0000)]
Merge "DhcpClient: guard against failure to parse packets" into mnc-dev
Xin Li [Tue, 8 Nov 2016 21:25:38 +0000 (21:25 +0000)]
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev." into mnc-dev
Jeff Sharkey [Mon, 7 Nov 2016 23:27:52 +0000 (23:27 +0000)]
Merge "Public volumes belong to a single user." into mnc-dev
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
Change-Id: If5b53f6f0a707f8d36603c09bfd3f72dbfbbbb99
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
Jeff Sharkey [Wed, 2 Nov 2016 21:26:01 +0000 (15:26 -0600)]
Public volumes belong to a single user.
When a public (vfat) device is inserted, it's strongly associated
with the current foreground user, and no other users should be able
to access it, since otherwise that would be a cross-user data leak.
To use the device under a different user, switch users and then
eject/remount the device.
Test: verified user isolation of USB drive
Bug:
32523490
Change-Id: I590c791996f1fea8d78f625dc942d149f1f41614
Hugo Benichi [Tue, 11 Oct 2016 02:39:39 +0000 (11:39 +0900)]
DhcpClient: guard against failure to parse packets
DhcpPacket.decodeFullPacket() is not exception safe and can throw
various runtime exceptions when trying to parse malicious or malformed
packets.
This patch adds a generic catch-all-exception in DhcpClient to avoid
propagating the exception and killing the framework process on reception
of such malformed packets.
Bug:
31850211
Change-Id: I2e723a792ff067ada2834da875700d4df16c5159
Sungsoo [Tue, 18 Oct 2016 18:00:54 +0000 (18:00 +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
am:
583a7017ce -s ours
Change-Id: I39976fd7bf943dd9b4e38c084270c977cf0511ca
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:41:49 +0000 (17:41 +0000)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens am:
135524f2c5 -s ours am:
02cd808ab8
am:
8e2451759d -s ours
Change-Id: Id0d69d1bddcf0d6059b53bd3a4b2b55df493899c
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:22 +0000 (17:35 +0000)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens am:
ad74e88f1d
am:
41b775b40a -s ours
Change-Id: I6ce63b74988fb4f87565be611a47c2f4a28cbc9b
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
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:18:24 +0000 (01:18 +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
am:
6d7f209964 -s ours
Change-Id: Iff979c99a7aff3e68740052c49b7850275839965
Suprabh Shukla [Sat, 15 Oct 2016 01:10:39 +0000 (01:10 +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
am:
2432cf3645 -s ours
Change-Id: Icbc41a48fbd9cc8f1c7423c96cac5730a52a78c9
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:43:00 +0000 (00:43 +0000)]
Merge "DO NOT MERGE Isolated processes don't get precached system service binders" into lmp-dev am:
35bd0fc5f0 -s ours am:
40a13c5917
am:
0645127e25 -s ours
Change-Id: I6ae49833a96e2e12420cfb916c8e080766a253e4
Suprabh Shukla [Sat, 15 Oct 2016 00:41:55 +0000 (00:41 +0000)]
DO NOT MERGE Isolated processes don't get precached system service binders am:
4779ee70a2 -s ours am:
8d124e37f1
am:
56b525a313 -s ours
Change-Id: Iab15781f9b4c30c883db9267b06cc85cc7c0f3df
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
Christopher Tate [Sat, 15 Oct 2016 00:41:09 +0000 (00:41 +0000)]
DO NOT MERGE Isolated processes don't get precached system service binders am:
190e66685f
am:
eafeb8becf -s ours
Change-Id: Ia2dd7a763735ffc612a1043faba75a97e0726298
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
TreeHugger Robot [Sat, 15 Oct 2016 00:23:48 +0000 (00:23 +0000)]
Merge "DO NOT MERGE Isolated processes don't get precached system service binders" into mnc-dev
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)
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:22:53 +0000 (22:22 +0000)]
DO NOT MERGE) ExifInterface: Provide backward compatibility am:
c11f599a2f am:
29e643bcbd am:
68aa33b9bf -s ours am:
2a762996cb -s ours am:
a8d06257c1
am:
2179b54c9c -s ours
Change-Id: I93f44a4deb665e4e5f8695fbc3b3e3a471260c28
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:06:00 +0000 (22:06 +0000)]
DO NOT MERGE) ExifInterface: Provide backward compatibility am:
22bd36448e -s ours am:
3992742559
am:
2816a5fa5e -s ours
Change-Id: I51df5f3d8e79c31f6c299fdbeec3fbfb9d9a300e
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:59:28 +0000 (21:59 +0000)]
DO NOT MERGE) ExifInterface: Provide backward compatibility am:
87a9ac70c3
am:
11b522b40f -s ours
Change-Id: I144aee71338030bd8db42cc8ba8c12976e371762
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:51:19 +0000 (13:51 -0700)]
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into
marshmallow-dev" into mnc-dev.
Change-Id: I7215eebd4a2cc9a4b6ccf2a3e36ed8edc556d208
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
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:36 +0000 (00:45 +0000)]
Merge "DO NOT MERGE - Added translations for emergency action string" into marshmallow-dev
Treehugger Robot [Thu, 13 Oct 2016 00:45:03 +0000 (00:45 +0000)]
Merge "DO NOT MERGE - Fixed an issue where the emergency affordance would show" into marshmallow-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:42:14 +0000 (20:42 +0000)]
Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-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 21:56:51 +0000 (21:56 +0000)]
Merge "DO NOT MERGE Fix build" into lmp-dev am:
fce3b76452 -s ours am:
ded4df2e79 am:
462493ee81
am:
585f642d65 -s ours
Change-Id: Ibbc592cb5fc2b035b87cbb89dcf5dee085c63e14
Jaewan Kim [Thu, 22 Sep 2016 21:55:51 +0000 (21:55 +0000)]
DO NOT MERGE Fix build am:
dfedca4e43 -s ours am:
499871ebe9 am:
3ea1f124f9
am:
ed3e26e2be -s ours
Change-Id: Ie4fd67251243bba5f6c39320b752cd1cb9f8987e
Jaewan Kim [Thu, 22 Sep 2016 20:34:22 +0000 (20:34 +0000)]
Merge "DO NOT MERGE Fix build" into lmp-dev am:
fce3b76452 -s ours am:
ded4df2e79
am:
462493ee81
Change-Id: I822c5aeb87aea023aa8dba38a4beb6de98225f4a
Jaewan Kim [Thu, 22 Sep 2016 20:33:24 +0000 (20:33 +0000)]
DO NOT MERGE Fix build am:
dfedca4e43 -s ours am:
499871ebe9
am:
3ea1f124f9
Change-Id: I6762900887ed8ec6afb5b787fc3a2426b846a6c1
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
Jaewan Kim [Thu, 22 Sep 2016 20:03:57 +0000 (20:03 +0000)]
DO NOT MERGE Fix build am:
dfedca4e43 -s ours
am:
499871ebe9
Change-Id: I7999092c3ba1df344f305b3e5d2befa65d1ad04a
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 13:58:30 +0000 (13:58 +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 am:
890f53a486 am:
1bf809c490
am:
6ad7c0f6ce -s ours
Change-Id: I71157581308c3ef4be7dad8db5c7d9a637a24320
Jaewan Kim [Thu, 22 Sep 2016 13:31:57 +0000 (13:31 +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 am:
f140f796ea am:
7eaeeb49bb
am:
7ffaaca237 -s ours
Change-Id: I1db1ad50bfd89c038f9d226109958011aeb1496e
Jaewan Kim [Thu, 22 Sep 2016 13:10:13 +0000 (13:10 +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 am:
890f53a486
am:
1bf809c490
Change-Id: I0a316929c7654f89e435ac459bc9175434136f99
Jaewan Kim [Thu, 22 Sep 2016 12:29:19 +0000 (12:29 +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
am:
890f53a486
Change-Id: I7f85d8785ce8829cb9d01a23413c545f5e5a769a
Ajay Panicker [Thu, 22 Sep 2016 12:28:51 +0000 (12:28 +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 am:
0241b6d88a am:
0fee65e58b
am:
08fed21f2c -s ours
Change-Id: I2e790e95077c0760d1be6d984e7e90fb62a3d9db
Jaewan Kim [Thu, 22 Sep 2016 11:21:01 +0000 (11:21 +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 am:
f140f796ea
am:
7eaeeb49bb
Change-Id: I21b359b1471ee527a2bc975c399253def98e40fe
Ajay Panicker [Thu, 22 Sep 2016 09:53:30 +0000 (09:53 +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 am:
0241b6d88a
am:
0fee65e58b
Change-Id: I6e5bb9fea57cf5fe9cff68952d6b2878ce005d7c
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
Ajay Panicker [Thu, 22 Sep 2016 09:38:13 +0000 (09:38 +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 am:
ed82c6fac8 am:
c1f8a09c1e
am:
8091a00994 -s ours
Change-Id: I51723f883566989133b0c8be92108b8c910c0981
Jaewan Kim [Thu, 22 Sep 2016 09:35:44 +0000 (09:35 +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
am:
f140f796ea
Change-Id: I8db6ebc6704a60d44739e873038403c2740304e3
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
Ajay Panicker [Thu, 22 Sep 2016 08:06:50 +0000 (08:06 +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 am:
ed82c6fac8
am:
c1f8a09c1e
Change-Id: I846d53b9f2b8ac6215d873d2dc8ae3efa20c5919
Jaewan Kim [Thu, 22 Sep 2016 08:06:16 +0000 (08:06 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into lmp-dev am:
64b7b1522e -s ours am:
5abd69e59a am:
f7f452fd28
am:
8a168a7c5d -s ours
Change-Id: Ib4a702bd653ca1083ac4846ac4a6947ef91e2e33
Jaewan Kim [Thu, 22 Sep 2016 08:05:11 +0000 (08:05 +0000)]
DO NOT MERGE Check caller for sending media key to global priority session am:
4e9af38ec4 -s ours am:
031fb04776 am:
2d88f87a82
am:
64110c6bf1 -s ours
Change-Id: I69062cb6535df22a743270a62fda89dcca155e87
OSDN Git Service
