199935 Commits

Author SHA1 Message Date
Jorim Jaggi
4fb3e9b3af am 50ff3afb: Start pulse fading exactly when screen is turned on
* commit '50ff3afb01f2ac4a93dba418a71d54ad8adeba9d':
  Start pulse fading exactly when screen is turned on
2015-08-14 19:01:55 +00:00
Jorim Jaggi
50ff3afb01 Start pulse fading exactly when screen is turned on
Bug: 23163299
Change-Id: I0f6d5dbfa02e455292e06a4f8f69ab68e9da2b6b
2015-08-14 18:47:59 +00:00
Jean-Michel Trivi
db56efe685 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
2015-08-14 18:38:51 +00:00
Jean-Michel Trivi
2152edeb30 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
2015-08-14 18:33:08 +00:00
Jean-Michel Trivi
16fa58cb13 Merge "Fix to check the incoming userid argument for RingtonePlayer" into mnc-dev 2015-08-14 18:19:17 +00:00
Chris Tate
b2d4c5507f 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
2015-08-14 17:21:52 +00:00
Dianne Hackborn
e2fd285045 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...
2015-08-14 17:21:46 +00:00
Chris Tate
b47890c4e7 am 7e7d79ef: Merge "Make "Ask every time" actually work that way" into mnc-dev
* commit '7e7d79ef2f4aa6a8da86af459d419bd24c47b440':
  Make "Ask every time" actually work that way
2015-08-14 17:15:37 +00:00
Dianne Hackborn
9e398eb514 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...
2015-08-14 17:15:33 +00:00
Chris Tate
7e7d79ef2f Merge "Make "Ask every time" actually work that way" into mnc-dev 2015-08-14 17:11:30 +00:00
Dianne Hackborn
81f3a85aa2 Merge "Fix issue #22940169: "pm grant" can no longer grant permissions..." into mnc-dev 2015-08-14 17:06:20 +00:00
Svetoslav Ganov
7c3d595a3d 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
2015-08-14 15:19:47 +00:00
Svetoslav Ganov
4b655fd193 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
2015-08-14 15:13:38 +00:00
Svetoslav Ganov
b045331fcb Merge "Add GTS test to ensure valid default permission grants - framework" into mnc-dev 2015-08-14 15:06:16 +00:00
Christopher Tate
56f0ff3c48 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
2015-08-13 18:56:05 -07:00
Jeff Sharkey
d28991a5e4 am b6f5bcd0: am cfcf6af9: Merge "Method to show DialogFragment allowing state loss." into mnc-dev
* commit 'b6f5bcd0c64676ad2dfddc9dcf4c4320fafb9d3a':
  Method to show DialogFragment allowing state loss.
2015-08-14 01:35:40 +00:00
Dianne Hackborn
9f5b0a2735 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
2015-08-13 18:25:20 -07:00
Joe Fernandez
e135f5b705 am 672c0a75: am 37dd5240: Merge "Doc change: Update preview pages for dp3." into mnc-dev
* commit '672c0a75d3905825365394d174b983dc5e796cf3':
  Doc change: Update preview pages for dp3.
2015-08-14 01:24:46 +00:00
Jeff Sharkey
b6f5bcd0c6 am cfcf6af9: Merge "Method to show DialogFragment allowing state loss." into mnc-dev
* commit 'cfcf6af915bee878bdaea04f48592bbbe506ad26':
  Method to show DialogFragment allowing state loss.
2015-08-14 01:24:44 +00:00
Jeff Sharkey
cfcf6af915 Merge "Method to show DialogFragment allowing state loss." into mnc-dev 2015-08-14 01:18:18 +00:00
Joe Fernandez
672c0a75d3 am 37dd5240: Merge "Doc change: Update preview pages for dp3." into mnc-dev
* commit '37dd5240ad54494e028d6b2973729f5cb40ccad9':
  Doc change: Update preview pages for dp3.
2015-08-14 01:16:52 +00:00
Joe Fernandez
37dd5240ad Merge "Doc change: Update preview pages for dp3." into mnc-dev 2015-08-14 01:10:56 +00:00
Jorim Jaggi
7453a0aa2c 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
2015-08-14 00:09:01 +00:00
Sungmin Choi
4a05bbcd38 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
2015-08-13 17:07:11 -07:00
Jorim Jaggi
587488e027 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
2015-08-13 23:58:29 +00:00
Jeff Sharkey
063f850060 Method to show DialogFragment allowing state loss.
Same as show(), but allowing state loss.

Bug: 22867250
Change-Id: Ib779d8a3febc70ad47a9c1a9099d858707bad733
2015-08-13 16:57:29 -07:00
Jorim Jaggi
81eeef5893 Merge "Update time when turning on screen, in addition to waking up" into mnc-dev 2015-08-13 23:51:11 +00:00
Jorim Jaggi
9373911d41 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
2015-08-13 15:56:41 -07:00
Wei Liu
d6fb8958d2 Merge "Add a setting to enable cellular on boot." into cw-e-dev 2015-08-13 22:35:43 +00:00
Joe Fernandez
a1bed325f6 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
2015-08-13 19:08:54 +00:00
Joe Fernandez
e41c18d629 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
2015-08-13 18:55:46 +00:00
Joe Fernandez
f755772957 Merge "docs: Update uses-sdk-element page with API 23 (M) listing" into mnc-dev 2015-08-13 18:49:40 +00:00
Joe Fernandez
901f807143 docs: Update uses-sdk-element page with API 23 (M) listing
Change-Id: If579411c66f3cfc02b270a04b266fe7562b48e14
2015-08-13 11:45:23 -07:00
Joe Fernandez
db5b38b23c 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
2015-08-13 18:42:51 +00:00
Joe Fernandez
195b1fd2b1 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
2015-08-13 18:33:47 +00:00
Joe Fernandez
8d149d7ff2 Merge "docs: Update developer docs make file to include API 23" into mnc-dev 2015-08-13 18:27:11 +00:00
Dirk Dougherty
2906bd5cb3 Doc change: Update preview pages for dp3.
Change-Id: If4a3beab28cc2114cf01a2d6202dc072768960fc
2015-08-13 10:54:50 -07:00
Mike Dodd
2891881202 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).
2015-08-13 15:30:12 +00:00
Mike Dodd
045ffe3105 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).
2015-08-13 15:22:48 +00:00
Mike Dodd
226ae04df4 Merge "Set default SMS/MMS app to com.android.messaging (new AOSP app)." into mnc-dev 2015-08-13 15:16:39 +00:00
Jason Monk
1f567039e0 am 60823dc1: am 90460c79: Merge "Add more intelligence to bluetooth connection state" into mnc-dev
* commit '60823dc1f90198ab2ec0e8b62cb03900251fcf77':
  Add more intelligence to bluetooth connection state
2015-08-13 14:52:30 +00:00
Jason Monk
60823dc1f9 am 90460c79: Merge "Add more intelligence to bluetooth connection state" into mnc-dev
* commit '90460c79d1af214e73428eac92b5761e743dec4d':
  Add more intelligence to bluetooth connection state
2015-08-13 14:44:55 +00:00
Jason Monk
90460c79d1 Merge "Add more intelligence to bluetooth connection state" into mnc-dev 2015-08-13 14:38:46 +00:00
Bart Sears
3ab3ffc646 am b7ae1990: am bd29b07e: Merge "Fix Keyguard drawn timeout" into mnc-dev
* commit 'b7ae19905a471b0e0c74cd76b9895cad93856deb':
  Fix Keyguard drawn timeout
2015-08-13 05:46:16 +00:00
Bart Sears
b7ae19905a am bd29b07e: Merge "Fix Keyguard drawn timeout" into mnc-dev
* commit 'bd29b07eab3956796a7a09d7612e42e22616f458':
  Fix Keyguard drawn timeout
2015-08-13 05:39:02 +00:00
Bart Sears
bd29b07eab Merge "Fix Keyguard drawn timeout" into mnc-dev 2015-08-13 05:32:14 +00:00
Svet Ganov
52153f4c05 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
2015-08-12 21:57:59 -07:00
Joe Fernandez
1827e3230d docs: Update developer docs make file to include API 23
Change-Id: I1bb9c37cafdfc7c78c23099a0fde2914f3068485
2015-08-12 19:45:22 -07:00
Jorim Jaggi
24cf834948 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
2015-08-13 02:04:52 +00:00
Jorim Jaggi
ac9fbe9d5c Merge "Do not vibrate if we don't have a fingerprint client" into mnc-dr-dev 2015-08-13 01:58:55 +00:00