OSDN Git Service
Julia Reynolds [Fri, 14 Aug 2015 19:43:21 +0000 (19:43 +0000)]
am
4e65a05f: am
ac5f9628: am
7df411d0: Merge "Clear calling identity before getting the current user." into mnc-dev
* commit '
4e65a05fb9d23f732e1cb72b67bc4fb2b7321788':
Clear calling identity before getting the current user.
Julia Reynolds [Fri, 14 Aug 2015 19:30:28 +0000 (19:30 +0000)]
am
ac5f9628: am
7df411d0: Merge "Clear calling identity before getting the current user." into mnc-dev
* commit '
ac5f962898de5a00fa2067e987b94bc28c5bb096':
Clear calling identity before getting the current user.
Julia Reynolds [Fri, 14 Aug 2015 19:22:04 +0000 (19:22 +0000)]
am
7df411d0: Merge "Clear calling identity before getting the current user." into mnc-dev
* commit '
7df411d0cced4a849bcdca58fa3c27eb731e0862':
Clear calling identity before getting the current user.
Julia Reynolds [Fri, 14 Aug 2015 19:17:31 +0000 (19:17 +0000)]
Merge "Clear calling identity before getting the current user." into mnc-dev
Jorim Jaggi [Fri, 14 Aug 2015 19:10:43 +0000 (19:10 +0000)]
am
4fb3e9b3: am
50ff3afb: Start pulse fading exactly when screen is turned on
* commit '
4fb3e9b3af6c44b3b4bc7eee0cb917520aa7474d':
Start pulse fading exactly when screen is turned on
Jorim Jaggi [Fri, 14 Aug 2015 19:01:55 +0000 (19:01 +0000)]
am
50ff3afb: Start pulse fading exactly when screen is turned on
* commit '
50ff3afb01f2ac4a93dba418a71d54ad8adeba9d':
Start pulse fading exactly when screen is turned on
Jorim Jaggi [Thu, 13 Aug 2015 01:35:42 +0000 (18:35 -0700)]
Start pulse fading exactly when screen is turned on
Bug:
23163299
Change-Id: I0f6d5dbfa02e455292e06a4f8f69ab68e9da2b6b
Jean-Michel Trivi [Fri, 14 Aug 2015 18:47:04 +0000 (18:47 +0000)]
am
db56efe6: am
2152edeb: am
16fa58cb: Merge "Fix to check the incoming userid argument for RingtonePlayer" into mnc-dev
* commit '
db56efe685d249e1e0e415b3e5b2086b5c2c205c':
Fix to check the incoming userid argument for RingtonePlayer
Jean-Michel Trivi [Fri, 14 Aug 2015 18:38:51 +0000 (18:38 +0000)]
am
2152edeb: am
16fa58cb: Merge "Fix to check the incoming userid argument for RingtonePlayer" into mnc-dev
* commit '
2152edeb3058ab9072b843bb32fbbadcc3957460':
Fix to check the incoming userid argument for RingtonePlayer
Jean-Michel Trivi [Fri, 14 Aug 2015 18:33:08 +0000 (18:33 +0000)]
am
16fa58cb: Merge "Fix to check the incoming userid argument for RingtonePlayer" into mnc-dev
* commit '
16fa58cb133f539016a5e013897c7de7f58ff16d':
Fix to check the incoming userid argument for RingtonePlayer
Jean-Michel Trivi [Fri, 14 Aug 2015 18:19:17 +0000 (18:19 +0000)]
Merge "Fix to check the incoming userid argument for RingtonePlayer" into mnc-dev
Chris Tate [Fri, 14 Aug 2015 17:30:05 +0000 (17:30 +0000)]
am
b2d4c550: am
b47890c4: am
7e7d79ef: Merge "Make "Ask every time" actually work that way" into mnc-dev
* commit '
b2d4c5507f82286cbb4b3d06f813459e6591164a':
Make "Ask every time" actually work that way
Dianne Hackborn [Fri, 14 Aug 2015 17:29:59 +0000 (17:29 +0000)]
am
e2fd2850: am
9e398eb5: am
81f3a85a: Merge "Fix issue #
22940169: "pm grant" can no longer grant permissions..." into mnc-dev
* commit '
e2fd2850450391bba5892faf4e90aff9107dd5dc':
Fix issue #
22940169: "pm grant" can no longer grant permissions...
Chris Tate [Fri, 14 Aug 2015 17:21:52 +0000 (17:21 +0000)]
am
b47890c4: am
7e7d79ef: Merge "Make "Ask every time" actually work that way" into mnc-dev
* commit '
b47890c4e7a7fc119e74da2b50bf94c2cf172916':
Make "Ask every time" actually work that way
Dianne Hackborn [Fri, 14 Aug 2015 17:21:46 +0000 (17:21 +0000)]
am
9e398eb5: am
81f3a85a: Merge "Fix issue #
22940169: "pm grant" can no longer grant permissions..." into mnc-dev
* commit '
9e398eb51497dbcd2347cb1315933fa4e7cfcd9e':
Fix issue #
22940169: "pm grant" can no longer grant permissions...
Chris Tate [Fri, 14 Aug 2015 17:15:37 +0000 (17:15 +0000)]
am
7e7d79ef: Merge "Make "Ask every time" actually work that way" into mnc-dev
* commit '
7e7d79ef2f4aa6a8da86af459d419bd24c47b440':
Make "Ask every time" actually work that way
Dianne Hackborn [Fri, 14 Aug 2015 17:15:33 +0000 (17:15 +0000)]
am
81f3a85a: Merge "Fix issue #
22940169: "pm grant" can no longer grant permissions..." into mnc-dev
* commit '
81f3a85aa29d83ed1a5de4de1006587d375a1c77':
Fix issue #
22940169: "pm grant" can no longer grant permissions...
Chris Tate [Fri, 14 Aug 2015 17:11:30 +0000 (17:11 +0000)]
Merge "Make "Ask every time" actually work that way" into mnc-dev
Dianne Hackborn [Fri, 14 Aug 2015 17:06:20 +0000 (17:06 +0000)]
Merge "Fix issue #
22940169: "pm grant" can no longer grant permissions..." into mnc-dev
Svetoslav Ganov [Fri, 14 Aug 2015 15:26:59 +0000 (15:26 +0000)]
am
7c3d595a: am
4b655fd1: am
b045331f: Merge "Add GTS test to ensure valid default permission grants - framework" into mnc-dev
* commit '
7c3d595a3d2bdded486a01d6b00a435f4881ceed':
Add GTS test to ensure valid default permission grants - framework
Svetoslav Ganov [Fri, 14 Aug 2015 15:19:47 +0000 (15:19 +0000)]
am
4b655fd1: am
b045331f: Merge "Add GTS test to ensure valid default permission grants - framework" into mnc-dev
* commit '
4b655fd193992afff948df513c7b9b9a0389972e':
Add GTS test to ensure valid default permission grants - framework
Svetoslav Ganov [Fri, 14 Aug 2015 15:13:38 +0000 (15:13 +0000)]
am
b045331f: Merge "Add GTS test to ensure valid default permission grants - framework" into mnc-dev
* commit '
b045331fcb033507072bfd7899a147bb2be7176e':
Add GTS test to ensure valid default permission grants - framework
Svetoslav Ganov [Fri, 14 Aug 2015 15:06:16 +0000 (15:06 +0000)]
Merge "Add GTS test to ensure valid default permission grants - framework" into mnc-dev
Christopher Tate [Thu, 13 Aug 2015 23:29:33 +0000 (16:29 -0700)]
Make "Ask every time" actually work that way
..in link-opening behavior. If a candidate is marked as "ask
every time," then the user is guaranteed to get a disambiguation
prompt including that candidate even when some other candidate
app is in the "always prefer this over a browser" state.
Bug
23147746
Change-Id: I904d8697a992b3f16f32b1c1b49c2bf9424c7137
Jeff Sharkey [Fri, 14 Aug 2015 01:42:07 +0000 (01:42 +0000)]
am
d28991a5: am
b6f5bcd0: am
cfcf6af9: Merge "Method to show DialogFragment allowing state loss." into mnc-dev
* commit '
d28991a5e4c8b32c1bffab6078e93249c1d5b7a6':
Method to show DialogFragment allowing state loss.
Jeff Sharkey [Fri, 14 Aug 2015 01:35:40 +0000 (01:35 +0000)]
am
b6f5bcd0: am
cfcf6af9: Merge "Method to show DialogFragment allowing state loss." into mnc-dev
* commit '
b6f5bcd0c64676ad2dfddc9dcf4c4320fafb9d3a':
Method to show DialogFragment allowing state loss.
Joe Fernandez [Fri, 14 Aug 2015 01:33:57 +0000 (01:33 +0000)]
am
e135f5b7: am
672c0a75: am
37dd5240: Merge "Doc change: Update preview pages for dp3." into mnc-dev
* commit '
e135f5b70596ac3857983c0e4abbba5565dad6ea':
Doc change: Update preview pages for dp3.
Dianne Hackborn [Fri, 14 Aug 2015 01:25:20 +0000 (18:25 -0700)]
Fix issue #
22940169: "pm grant" can no longer grant permissions...
...with protection flag PROTECTION_FLAG_DEVELOPMENT
Bring back the old grant/revoke code for development permissions.
Also some more dumpsys output to help debugging.
And new dumpsys command for checking a permission.
Change-Id: I6e27e62a9ca5ec1ecc0f102714a448ea02f0f41c
Joe Fernandez [Fri, 14 Aug 2015 01:24:46 +0000 (01:24 +0000)]
am
672c0a75: am
37dd5240: Merge "Doc change: Update preview pages for dp3." into mnc-dev
* commit '
672c0a75d3905825365394d174b983dc5e796cf3':
Doc change: Update preview pages for dp3.
Jeff Sharkey [Fri, 14 Aug 2015 01:24:44 +0000 (01:24 +0000)]
am
cfcf6af9: Merge "Method to show DialogFragment allowing state loss." into mnc-dev
* commit '
cfcf6af915bee878bdaea04f48592bbbe506ad26':
Method to show DialogFragment allowing state loss.
Jeff Sharkey [Fri, 14 Aug 2015 01:18:18 +0000 (01:18 +0000)]
Merge "Method to show DialogFragment allowing state loss." into mnc-dev
Joe Fernandez [Fri, 14 Aug 2015 01:16:52 +0000 (01:16 +0000)]
am
37dd5240: Merge "Doc change: Update preview pages for dp3." into mnc-dev
* commit '
37dd5240ad54494e028d6b2973729f5cb40ccad9':
Doc change: Update preview pages for dp3.
Joe Fernandez [Fri, 14 Aug 2015 01:10:56 +0000 (01:10 +0000)]
Merge "Doc change: Update preview pages for dp3." into mnc-dev
Jorim Jaggi [Fri, 14 Aug 2015 00:16:00 +0000 (00:16 +0000)]
am
7453a0aa: am
587488e0: am
81eeef58: Merge "Update time when turning on screen, in addition to waking up" into mnc-dev
* commit '
7453a0aa2cf3dabb7390dec56dd4523053f20330':
Update time when turning on screen, in addition to waking up
Jorim Jaggi [Fri, 14 Aug 2015 00:09:01 +0000 (00:09 +0000)]
am
587488e0: am
81eeef58: Merge "Update time when turning on screen, in addition to waking up" into mnc-dev
* commit '
587488e027c41394dc6a1f2248c4dbe8d3530b69':
Update time when turning on screen, in addition to waking up
Sungmin Choi [Sat, 8 Aug 2015 01:12:19 +0000 (18:12 -0700)]
Fix to check the incoming userid argument for RingtonePlayer
In PowerNotificationWarnings, where it dispatches notifications
with UserHandle.ALL:
mNoMan.notifyAsUser(TAG_NOTIFICATION, R.id.notification_power, n, UserHandle.ALL);
The fix is to have RingtonePlayer check the incoming userId argument to playAsync(),
and change USER_ALL to USER_OWNER.
BUG=
22516181
BUG=
22992637
Change-Id: Ia3f8aaa2bee7fb15c24542e2331b2bc5a877e715
Jorim Jaggi [Thu, 13 Aug 2015 23:58:29 +0000 (23:58 +0000)]
am
81eeef58: Merge "Update time when turning on screen, in addition to waking up" into mnc-dev
* commit '
81eeef589386483722c21572d9ab6d3f95dd26be':
Update time when turning on screen, in addition to waking up
Jeff Sharkey [Thu, 13 Aug 2015 23:57:29 +0000 (16:57 -0700)]
Method to show DialogFragment allowing state loss.
Same as show(), but allowing state loss.
Bug:
22867250
Change-Id: Ib779d8a3febc70ad47a9c1a9099d858707bad733
Jorim Jaggi [Thu, 13 Aug 2015 23:51:11 +0000 (23:51 +0000)]
Merge "Update time when turning on screen, in addition to waking up" into mnc-dev
Jorim Jaggi [Thu, 13 Aug 2015 22:53:14 +0000 (15:53 -0700)]
Update time when turning on screen, in addition to waking up
When in ambient display mode, we didn't get a callback to
onStartedWakingUp, thus the time was never refreshed. Since
broadcasts are disabled in this low-power state, we need to refresh
the clock manually before turning on the screen, because we can't
rely on the broadcasts to be delivered.
Bug:
23171638
Change-Id: I249f4195a14995f7c1467e73ac2aa400b871f80e
Wei Liu [Thu, 13 Aug 2015 22:43:52 +0000 (22:43 +0000)]
am
d6fb8958: Merge "Add a setting to enable cellular on boot." into cw-e-dev
* commit '
d6fb8958d2baccffb176ae75c657963212726e79':
Add a setting to enable cellular on boot.
Wei Liu [Thu, 13 Aug 2015 22:35:43 +0000 (22:35 +0000)]
Merge "Add a setting to enable cellular on boot." into cw-e-dev
Joe Fernandez [Thu, 13 Aug 2015 19:16:00 +0000 (19:16 +0000)]
am
a1bed325: am
e41c18d6: am
f7557729: Merge "docs: Update uses-sdk-element page with API 23 (M) listing" into mnc-dev
* commit '
a1bed325f65fa08087460fa02c7139f9c427fdbd':
docs: Update uses-sdk-element page with API 23 (M) listing
Joe Fernandez [Thu, 13 Aug 2015 19:08:54 +0000 (19:08 +0000)]
am
e41c18d6: am
f7557729: Merge "docs: Update uses-sdk-element page with API 23 (M) listing" into mnc-dev
* commit '
e41c18d629d65e302d4c40f2582845225da0d4f4':
docs: Update uses-sdk-element page with API 23 (M) listing
Joe Fernandez [Thu, 13 Aug 2015 18:55:46 +0000 (18:55 +0000)]
am
f7557729: Merge "docs: Update uses-sdk-element page with API 23 (M) listing" into mnc-dev
* commit '
f75577295765ca13bf3d0d5bffa81b569cb88da2':
docs: Update uses-sdk-element page with API 23 (M) listing
Joe Fernandez [Thu, 13 Aug 2015 18:49:40 +0000 (18:49 +0000)]
Merge "docs: Update uses-sdk-element page with API 23 (M) listing" into mnc-dev
Joe Fernandez [Thu, 13 Aug 2015 18:48:12 +0000 (18:48 +0000)]
am
db5b38b2: am
195b1fd2: am
8d149d7f: Merge "docs: Update developer docs make file to include API 23" into mnc-dev
* commit '
db5b38b23c629b18b9a92956c68f82dbaa4e22ef':
docs: Update developer docs make file to include API 23
Joe Fernandez [Thu, 13 Aug 2015 18:45:23 +0000 (11:45 -0700)]
docs: Update uses-sdk-element page with API 23 (M) listing
Change-Id: If579411c66f3cfc02b270a04b266fe7562b48e14
Joe Fernandez [Thu, 13 Aug 2015 18:42:51 +0000 (18:42 +0000)]
am
195b1fd2: am
8d149d7f: Merge "docs: Update developer docs make file to include API 23" into mnc-dev
* commit '
195b1fd2b1fbbd25bb18e263489f58a7b14a0139':
docs: Update developer docs make file to include API 23
Joe Fernandez [Thu, 13 Aug 2015 18:33:47 +0000 (18:33 +0000)]
am
8d149d7f: Merge "docs: Update developer docs make file to include API 23" into mnc-dev
* commit '
8d149d7ff278c877bf7ccff7cc428cf7ba1db1e4':
docs: Update developer docs make file to include API 23
Joe Fernandez [Thu, 13 Aug 2015 18:27:11 +0000 (18:27 +0000)]
Merge "docs: Update developer docs make file to include API 23" into mnc-dev
Dirk Dougherty [Thu, 13 Aug 2015 16:55:30 +0000 (09:55 -0700)]
Doc change: Update preview pages for dp3.
Change-Id: If4a3beab28cc2114cf01a2d6202dc072768960fc
Mike Dodd [Thu, 13 Aug 2015 15:36:22 +0000 (15:36 +0000)]
am
28918812: am
045ffe31: am
226ae04d: Merge "Set default SMS/MMS app to com.android.messaging (new AOSP app)." into mnc-dev
* commit '
28918812028f69a6e2c81f56b31724edd35307ce':
Set default SMS/MMS app to com.android.messaging (new AOSP app).
Mike Dodd [Thu, 13 Aug 2015 15:30:12 +0000 (15:30 +0000)]
am
045ffe31: am
226ae04d: Merge "Set default SMS/MMS app to com.android.messaging (new AOSP app)." into mnc-dev
* commit '
045ffe31056b340fb962c4fef3ed3dbf00b5d251':
Set default SMS/MMS app to com.android.messaging (new AOSP app).
Mike Dodd [Thu, 13 Aug 2015 15:22:48 +0000 (15:22 +0000)]
am
226ae04d: Merge "Set default SMS/MMS app to com.android.messaging (new AOSP app)." into mnc-dev
* commit '
226ae04df4b3570d11b66d52a404b2c8b2ac50db':
Set default SMS/MMS app to com.android.messaging (new AOSP app).
Mike Dodd [Thu, 13 Aug 2015 15:16:39 +0000 (15:16 +0000)]
Merge "Set default SMS/MMS app to com.android.messaging (new AOSP app)." into mnc-dev
Jason Monk [Thu, 13 Aug 2015 14:59:15 +0000 (14:59 +0000)]
am
1f567039: am
60823dc1: am
90460c79: Merge "Add more intelligence to bluetooth connection state" into mnc-dev
* commit '
1f567039e042314d378b4fb50279e81d773e8733':
Add more intelligence to bluetooth connection state
Jason Monk [Thu, 13 Aug 2015 14:52:30 +0000 (14:52 +0000)]
am
60823dc1: am
90460c79: Merge "Add more intelligence to bluetooth connection state" into mnc-dev
* commit '
60823dc1f90198ab2ec0e8b62cb03900251fcf77':
Add more intelligence to bluetooth connection state
Jason Monk [Thu, 13 Aug 2015 14:44:55 +0000 (14:44 +0000)]
am
90460c79: Merge "Add more intelligence to bluetooth connection state" into mnc-dev
* commit '
90460c79d1af214e73428eac92b5761e743dec4d':
Add more intelligence to bluetooth connection state
Jason Monk [Thu, 13 Aug 2015 14:38:46 +0000 (14:38 +0000)]
Merge "Add more intelligence to bluetooth connection state" into mnc-dev
Julia Reynolds [Thu, 13 Aug 2015 13:01:33 +0000 (09:01 -0400)]
Clear calling identity before getting the current user.
This is necessary so non-privilged apps can call setInterruptionFilter.
Bug:
23156657
Change-Id: Ia903a39626c93957276d66805446cd25a91341b5
Bart Sears [Thu, 13 Aug 2015 05:51:48 +0000 (05:51 +0000)]
am
3ab3ffc6: am
b7ae1990: am
bd29b07e: Merge "Fix Keyguard drawn timeout" into mnc-dev
* commit '
3ab3ffc646f311f03f464e175f0d4f73c79c0d68':
Fix Keyguard drawn timeout
Bart Sears [Thu, 13 Aug 2015 05:46:16 +0000 (05:46 +0000)]
am
b7ae1990: am
bd29b07e: Merge "Fix Keyguard drawn timeout" into mnc-dev
* commit '
b7ae19905a471b0e0c74cd76b9895cad93856deb':
Fix Keyguard drawn timeout
Bart Sears [Thu, 13 Aug 2015 05:39:02 +0000 (05:39 +0000)]
am
bd29b07e: Merge "Fix Keyguard drawn timeout" into mnc-dev
* commit '
bd29b07eab3956796a7a09d7612e42e22616f458':
Fix Keyguard drawn timeout
Bart Sears [Thu, 13 Aug 2015 05:32:14 +0000 (05:32 +0000)]
Merge "Fix Keyguard drawn timeout" into mnc-dev
Svet Ganov [Tue, 11 Aug 2015 15:59:12 +0000 (08:59 -0700)]
Add GTS test to ensure valid default permission grants - framework
The platform grants runtime permissions by default to apps on the
system image that provide core device use cases which a user expects
to work out-of-the-box. We are now adding a test to ensure that
OEMs cannot pregrant premissions on non approved components.
bug:
23043018
Change-Id: Id76717cce0ee59678956bd0be347d3c045fe4c51
Joe Fernandez [Thu, 13 Aug 2015 02:45:22 +0000 (19:45 -0700)]
docs: Update developer docs make file to include API 23
Change-Id: I1bb9c37cafdfc7c78c23099a0fde2914f3068485
Jorim Jaggi [Thu, 13 Aug 2015 02:10:42 +0000 (02:10 +0000)]
am
24cf8349: am
ac9fbe9d: Merge "Do not vibrate if we don\'t have a fingerprint client" into mnc-dr-dev
* commit '
24cf83494844f1ce3c247660af61307366330c80':
Do not vibrate if we don't have a fingerprint client
Jorim Jaggi [Thu, 13 Aug 2015 02:04:52 +0000 (02:04 +0000)]
am
ac9fbe9d: Merge "Do not vibrate if we don\'t have a fingerprint client" into mnc-dr-dev
* commit '
ac9fbe9d5c235544f058ea9e240085e6a329f6ea':
Do not vibrate if we don't have a fingerprint client
Jorim Jaggi [Thu, 13 Aug 2015 01:58:55 +0000 (01:58 +0000)]
Merge "Do not vibrate if we don't have a fingerprint client" into mnc-dr-dev
Jorim Jaggi [Thu, 13 Aug 2015 01:09:26 +0000 (01:09 +0000)]
am
d59f5c02: am
a78181b6: Merge "Fix touch-to-wake while dozing" into mnc-dr-dev
* commit '
d59f5c02810095bba4bc7a47f9169655d4be7521':
Fix touch-to-wake while dozing
Jorim Jaggi [Thu, 13 Aug 2015 01:09:21 +0000 (01:09 +0000)]
am
73d9e1ce: am
69082a29: Merge "Require strong authentication after a timeout" into mnc-dr-dev
* commit '
73d9e1ce0bc8e4478b165fd5f550c99830fbcb57':
Require strong authentication after a timeout
Dianne Hackborn [Thu, 13 Aug 2015 01:09:15 +0000 (01:09 +0000)]
am
a54d4583: am
9512a857: am
ff9912d5: Merge "Fix issue #
23116383: Include security patch level in Settings" into mnc-dev
* commit '
a54d4583ec4d6b112a99c29ef71fbabfd67478cb':
Fix issue #
23116383: Include security patch level in Settings
Jorim Jaggi [Thu, 13 Aug 2015 01:06:22 +0000 (18:06 -0700)]
Do not vibrate if we don't have a fingerprint client
Bug:
22851337
Change-Id: Ia7be6eda2db08b4df07a48ffa4d24637f59167e9
Jorim Jaggi [Thu, 13 Aug 2015 01:02:35 +0000 (01:02 +0000)]
am
a78181b6: Merge "Fix touch-to-wake while dozing" into mnc-dr-dev
* commit '
a78181b6a88d4ce32bb2b1f01e03b9b048dbaf54':
Fix touch-to-wake while dozing
Jorim Jaggi [Thu, 13 Aug 2015 01:02:31 +0000 (01:02 +0000)]
am
69082a29: Merge "Require strong authentication after a timeout" into mnc-dr-dev
* commit '
69082a298f50680128ada89a8bef777f0fadf829':
Require strong authentication after a timeout
Dianne Hackborn [Thu, 13 Aug 2015 01:02:26 +0000 (01:02 +0000)]
am
9512a857: am
ff9912d5: Merge "Fix issue #
23116383: Include security patch level in Settings" into mnc-dev
* commit '
9512a857454d761b53f46958733ba23216c41e64':
Fix issue #
23116383: Include security patch level in Settings
Jorim Jaggi [Thu, 13 Aug 2015 00:56:14 +0000 (00:56 +0000)]
Merge "Fix touch-to-wake while dozing" into mnc-dr-dev
Jorim Jaggi [Thu, 13 Aug 2015 00:56:04 +0000 (00:56 +0000)]
Merge "Require strong authentication after a timeout" into mnc-dr-dev
Dianne Hackborn [Thu, 13 Aug 2015 00:54:35 +0000 (00:54 +0000)]
am
ff9912d5: Merge "Fix issue #
23116383: Include security patch level in Settings" into mnc-dev
* commit '
ff9912d594bc5cdc10a4a224b9a2296bac50851b':
Fix issue #
23116383: Include security patch level in Settings
Dianne Hackborn [Thu, 13 Aug 2015 00:46:59 +0000 (00:46 +0000)]
Merge "Fix issue #
23116383: Include security patch level in Settings" into mnc-dev
Jeff Sharkey [Thu, 13 Aug 2015 00:19:46 +0000 (00:19 +0000)]
am
d913d78a: am
ea68c4ce: am
c97509c0: Merge "Update ifaces when global restriction changes." into mnc-dev
* commit '
d913d78a331de5e488b27810d8dd18399f50de48':
Update ifaces when global restriction changes.
Jeff Sharkey [Thu, 13 Aug 2015 00:11:49 +0000 (00:11 +0000)]
am
ea68c4ce: am
c97509c0: Merge "Update ifaces when global restriction changes." into mnc-dev
* commit '
ea68c4ceacbe235c4d8688437010d855ef02e1fb':
Update ifaces when global restriction changes.
Jeff Sharkey [Thu, 13 Aug 2015 00:00:13 +0000 (00:00 +0000)]
am
c97509c0: Merge "Update ifaces when global restriction changes." into mnc-dev
* commit '
c97509c0292910d7fb27e4c890ad4bc0ea723fec':
Update ifaces when global restriction changes.
Jeff Sharkey [Wed, 12 Aug 2015 23:51:55 +0000 (23:51 +0000)]
Merge "Update ifaces when global restriction changes." into mnc-dev
Jeff Sharkey [Wed, 12 Aug 2015 23:46:05 +0000 (16:46 -0700)]
Update ifaces when global restriction changes.
Global restriction of background data only applies to metered
interfaces, but battery saver applies to all interfaces. In the
very specific case where global background had been turned on while
battery saver was enabled, we'd end up with a stale battery saver
rule floating around.
This change triggers an update of iface rules when the global
restriction changes, giving us consistent behavior.
Bug:
23098198
Change-Id: I454dc71cf11d50a2e9e6122e8a801ff17039b43a
Jorim Jaggi [Wed, 12 Aug 2015 02:30:46 +0000 (19:30 -0700)]
Fix touch-to-wake while dozing
Bug:
23113439
Change-Id: I7abcf1b4298fc832ba78df742c691246766993b1
Jorim Jaggi [Tue, 11 Aug 2015 22:54:06 +0000 (15:54 -0700)]
Require strong authentication after a timeout
Bug:
21594472
Change-Id: Iab169d4fa2e4ad134f8c8579654b28e96b5b1385
Roshan Pius [Wed, 12 Aug 2015 23:25:22 +0000 (23:25 +0000)]
am
289ecbbf: am
737aed41: Merge "Add a new carrier config for DTMF tone gap." into mnc-dr-dev
* commit '
289ecbbfafbb73ccf00e14ea8e2f6584406b50fe':
Add a new carrier config for DTMF tone gap.
Roshan Pius [Wed, 12 Aug 2015 23:17:27 +0000 (23:17 +0000)]
am
737aed41: Merge "Add a new carrier config for DTMF tone gap." into mnc-dr-dev
* commit '
737aed41ca9d8bad425ed8223fa4e4c84c7b102c':
Add a new carrier config for DTMF tone gap.
Roshan Pius [Wed, 12 Aug 2015 23:12:24 +0000 (23:12 +0000)]
Merge "Add a new carrier config for DTMF tone gap." into mnc-dr-dev
Dianne Hackborn [Wed, 12 Aug 2015 23:10:58 +0000 (16:10 -0700)]
Fix issue #
23116383: Include security patch level in Settings
Change-Id: I4934c7d26bf69b5c599962cd74ac1e4ea4ad4b51
Mike Dodd [Tue, 11 Aug 2015 20:14:53 +0000 (13:14 -0700)]
Set default SMS/MMS app to com.android.messaging (new AOSP app).
b/
23110861
Change-Id: Ifcdcfdea4d19875bf32ec19d245abc5e5a582b4c
Raph Levien [Wed, 12 Aug 2015 21:22:46 +0000 (21:22 +0000)]
am
855a862f: am
c98a786c: am
beabcb92: Merge "Fix Insertion ActionMode not showing on RTL languages" into mnc-dev
* commit '
855a862f6d1ef1af1b16c21d67645b5141db94fc':
Fix Insertion ActionMode not showing on RTL languages
Raph Levien [Wed, 12 Aug 2015 21:13:32 +0000 (21:13 +0000)]
am
c98a786c: am
beabcb92: Merge "Fix Insertion ActionMode not showing on RTL languages" into mnc-dev
* commit '
c98a786c693bf0bb617348e858ffe720db4d96d8':
Fix Insertion ActionMode not showing on RTL languages
Raph Levien [Wed, 12 Aug 2015 21:07:43 +0000 (21:07 +0000)]
am
beabcb92: Merge "Fix Insertion ActionMode not showing on RTL languages" into mnc-dev
* commit '
beabcb92cbdec6f68bd712c9972e6f8377b78f46':
Fix Insertion ActionMode not showing on RTL languages
Roshan Pius [Wed, 12 Aug 2015 19:01:42 +0000 (12:01 -0700)]
Add a new carrier config for DTMF tone gap.
Adding a new carrier config key to specify the gap between the DTMF
tones sent out to the network.
BUG:
23064351
Change-Id: I3a0e20efecd62f533e796a40097f181d4c20d614
Raph Levien [Wed, 12 Aug 2015 21:00:07 +0000 (21:00 +0000)]
Merge "Fix Insertion ActionMode not showing on RTL languages" into mnc-dev
Eino-Ville Talvala [Wed, 12 Aug 2015 20:41:55 +0000 (20:41 +0000)]
am
6986410a: am
5679800f: am
242ff8a8: Merge "Camera: Fix framework bugs with DEPTH-only camera devices" into mnc-dev
* commit '
6986410a598fd214cdcbd684c236d071a198c075':
Camera: Fix framework bugs with DEPTH-only camera devices
Eino-Ville Talvala [Wed, 12 Aug 2015 20:32:53 +0000 (20:32 +0000)]
am
5679800f: am
242ff8a8: Merge "Camera: Fix framework bugs with DEPTH-only camera devices" into mnc-dev
* commit '
5679800f382918bb3ca159997609fc551f2a739a':
Camera: Fix framework bugs with DEPTH-only camera devices
OSDN Git Service
