drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
197,712 Commits 1 Branch 0 Tags
Commit Graph

197712 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Selim Cinek
2a10ff0893 am 60e15dae: Merge "Fixed a bug where a fingerprint animation was not running" into mnc-dev 
* commit '60e15dae5aac3ea7529c13981ad339a8312e2fb2':
  Fixed a bug where a fingerprint animation was not running
 2015-07-17 01:40:01 +00:00
Selim Cinek
60e15dae5a Merge "Fixed a bug where a fingerprint animation was not running" into mnc-dev 2015-07-17 01:29:29 +00:00
Jae Seo
25cb2b99e6 am d19ed4c1: Merge "TIF: Avoid generating locale dependent input IDs" into mnc-dev 
* commit 'd19ed4c16d0c11bb68dd3a7aab0fb1845814dac8':
  TIF: Avoid generating locale dependent input IDs
 2015-07-17 01:09:52 +00:00
Dan Sandler
8f895de9f4 am 86647987: Icon-related Notifications API changes: 
* commit '86647987c3c6bf4e6a8bacd763ff16f1806c70a3':
  Icon-related Notifications API changes:
 2015-07-17 01:09:48 +00:00
Jae Seo
d19ed4c16d Merge "TIF: Avoid generating locale dependent input IDs" into mnc-dev 2015-07-17 01:07:03 +00:00
Dan Sandler
86647987c3 Icon-related Notifications API changes: 
- Deprecate Notification.icon and largeIcon.
    setSmallIcon(Icon) and setLargeIcon(Icon) should be used
    instead.
  - Add Icon support to Notification actions; deprecate
    Action.icon and methods/ctors that use int.

Bug: 21310773
Bug: 21271587
Change-Id: Iddac8121e7690e9d7a0360edb488ab77e3e8fb3a
 2015-07-17 00:59:20 +00:00
Adrian Roos
6893aeee48 am 5536bb48: Merge "Fix stuck scrim on keyguard-less devices" into mnc-dev 
* commit '5536bb48b2829f04f9a8258bfe698e5e4a26f234':
  Fix stuck scrim on keyguard-less devices
 2015-07-17 00:56:20 +00:00
Jae Seo
2ac1fd3c9d TIF: Avoid generating locale dependent input IDs 
Bug: 22519551
Change-Id: Id818f075fa4863b6e1a6f707e0debe8f08973f25
 2015-07-16 17:48:55 -07:00
Adrian Roos
5536bb48b2 Merge "Fix stuck scrim on keyguard-less devices" into mnc-dev 2015-07-17 00:43:18 +00:00
Adam Powell
2fca481233 am 9ba039bb: Merge "Update ChooserTarget constructor to take ComponentName, Bundle" into mnc-dev 
* commit '9ba039bbe9478c56ae3875a9933d3ba754367dc2':
  Update ChooserTarget constructor to take ComponentName, Bundle
 2015-07-17 00:32:58 +00:00
Adam Powell
9ba039bbe9 Merge "Update ChooserTarget constructor to take ComponentName, Bundle" into mnc-dev 2015-07-17 00:25:11 +00:00
Selim Cinek
e8bae6288b Fixed a bug where a fingerprint animation was not running 
Previously the fingerprint animation would not run
when we successfully unlocked with the fingerprint,
because we were checking for the wrong state.

Bug: 22483380
Change-Id: I8d3ec303a43323431b8866df29ddd6d668edc1ed
 2015-07-16 17:23:26 -07:00
Svet Ganov
b0f8fee845 am 6f561a24: Merge "Improve documentation of onRequestPermissionsResult" into mnc-dev 
* commit '6f561a24c97d25a858cf98eef5c502ef8d80cfc1':
  Improve documentation of onRequestPermissionsResult
 2015-07-17 00:03:30 +00:00
Svet Ganov
6f561a24c9 Merge "Improve documentation of onRequestPermissionsResult" into mnc-dev 2015-07-16 23:51:53 +00:00
Adam Powell
666d82a6d5 Update ChooserTarget constructor to take ComponentName, Bundle 
Simplify ChooserTarget handling by requiring a target component and an
extras bundle instead of a full PendingIntent/IntentSender. This
simplifies the handling of URI grants from sending apps.

Prune ChooserTargets that point at ComponentNames that don't share a
package with the original matching Activity target or that aren't
exported so that we don't show the user something they can't launch.

Bug 22516282

Change-Id: I3439c0910b4fa4f95c7a881b529942c96ffc953e
 2015-07-16 16:29:59 -07:00
Svet Ganov
0f45c7c7c4 Improve documentation of onRequestPermissionsResult 
bug:22524902

Change-Id: Ic435171fa016d8841bea432c5c39d7b0a6a7b9e9
 2015-07-16 16:29:04 -07:00
Roshan Pius
5926761865 am 5aff3b54: Merge "Maintain call time across SRVCC (2/3)." into mnc-dev 
* commit '5aff3b5489262ccff4b6f9e18e0d990ebfe4d7bc':
  Maintain call time across SRVCC (2/3).
 2015-07-16 23:19:17 +00:00
Roshan Pius
5aff3b5489 Merge "Maintain call time across SRVCC (2/3)." into mnc-dev 2015-07-16 23:09:19 +00:00
Alex Klyubin
e8ce214482 am f7592b23: Merge "HMAC keys are authorized for exactly one digest." into mnc-dev 
* commit 'f7592b234acde62f0f0a93dad77284f12ca9980a':
  HMAC keys are authorized for exactly one digest.
 2015-07-16 22:49:54 +00:00
Alex Klyubin
f7592b234a Merge "HMAC keys are authorized for exactly one digest." into mnc-dev 2015-07-16 22:40:06 +00:00
Svet Ganov
c00e49b6e4 am d4b566bf: Merge "Add APIs for verifier to grant at install and revoke permissions" into mnc-dev 
* commit 'd4b566bf56333de708908ce4accb5fb067be64f0':
  Add APIs for verifier to grant at install and revoke permissions
 2015-07-16 22:23:38 +00:00
Chris Craik
7b0fa466b5 am 0f724601: Merge "Fix clip area behavior for REPLACE op" into mnc-dev 
* commit '0f724601d78d8f36a297333227d9c460e10b3203':
  Fix clip area behavior for REPLACE op
 2015-07-16 22:23:34 +00:00
Svet Ganov
d4b566bf56 Merge "Add APIs for verifier to grant at install and revoke permissions" into mnc-dev 2015-07-16 22:22:01 +00:00
Chris Craik
0f724601d7 Merge "Fix clip area behavior for REPLACE op" into mnc-dev 2015-07-16 22:11:41 +00:00
Dianne Hackborn
9236af43d8 am aaee5b53: Merge "Work on issue #22516282: ChooserTarget URI grants not forwarded" into mnc-dev 
* commit 'aaee5b5334746cabd59aed69153d08ecbb70ab1d':
  Work on issue #22516282: ChooserTarget URI grants not forwarded
 2015-07-16 21:51:49 +00:00
Dianne Hackborn
aaee5b5334 Merge "Work on issue #22516282: ChooserTarget URI grants not forwarded" into mnc-dev 2015-07-16 21:44:21 +00:00
Makoto Onuki
d737ab1776 am b09b84ca: Merge "DefaultPermission: GET_ACCOUNTS is now in CONTACTS" into mnc-dev 
* commit 'b09b84cafde5ac31f5ef5c79f7a78db540824471':
  DefaultPermission: GET_ACCOUNTS is now in CONTACTS
 2015-07-16 21:19:33 +00:00
Makoto Onuki
b09b84cafd Merge "DefaultPermission: GET_ACCOUNTS is now in CONTACTS" into mnc-dev 2015-07-16 21:01:39 +00:00
Chris Craik
8ce8f3f4d6 Fix clip area behavior for REPLACE op 
bug:22291400

Work around clippath-clipped-to-view-bounds behavior by
implementing REPLACE op fast path, avoiding the transition to
SkRegion/SkPath.

Change-Id: I63c1cf961db2d6e3759d83914de1036c9ac7497a
 2015-07-16 13:31:41 -07:00
Svet Ganov
f8847c02dc am db8fa48e: Merge "Return a result from Fragment#shouldShowRequestPermissionRationale" into mnc-dev 
* commit 'db8fa48ed0864125a07f2bbe078fd60abd875ac7':
  Return a result from Fragment#shouldShowRequestPermissionRationale
 2015-07-16 19:27:18 +00:00
Svet Ganov
db8fa48ed0 Merge "Return a result from Fragment#shouldShowRequestPermissionRationale" into mnc-dev 2015-07-16 19:16:59 +00:00
Robert Schaub
70ab6b7914 am 081649c2: am f4db2de8: am 1b29a957: Merge "docs: Added "location" before "gps" in list under "Declaring hardware ..."" into mnc-preview-docs 
* commit '081649c2b5ffc1d9ea7a389cc9687659544a535e':
  docs: Added "location" before "gps" in list under "Declaring hardware ..."
 2015-07-16 19:10:48 +00:00
Robert Schaub
081649c2b5 am f4db2de8: am 1b29a957: Merge "docs: Added "location" before "gps" in list under "Declaring hardware ..."" into mnc-preview-docs 
* commit 'f4db2de881d197db0dfd76645dfd7a95b1f8f0de':
  docs: Added "location" before "gps" in list under "Declaring hardware ..."
 2015-07-16 18:57:39 +00:00
Dianne Hackborn
9e55d57dc7 am 8983420d: Merge "Don\'t spam the system with unique wake lock names." into mnc-dev 
* commit '8983420d30d3e962c519d7f9a5d8b8ea4bc3f42c':
  Don't spam the system with unique wake lock names.
 2015-07-16 18:45:37 +00:00
Robert Schaub
f4db2de881 am 1b29a957: Merge "docs: Added "location" before "gps" in list under "Declaring hardware ..."" into mnc-preview-docs 
* commit '1b29a95789c29174d5e4d526f6449c2c354ef3b3':
  docs: Added "location" before "gps" in list under "Declaring hardware ..."
 2015-07-16 18:40:37 +00:00
Makoto Onuki
bc92479a29 DefaultPermission: GET_ACCOUNTS is now in CONTACTS 
Bug 22532312

Change-Id: If7ad0faa3a196bb28da1ddc13788c0430df1d1ee
 2015-07-16 11:38:00 -07:00
Dianne Hackborn
8983420d30 Merge "Don't spam the system with unique wake lock names." into mnc-dev 2015-07-16 18:31:19 +00:00
Robert Schaub
1b29a95789 Merge "docs: Added "location" before "gps" in list under "Declaring hardware ..."" into mnc-preview-docs 2015-07-16 18:21:22 +00:00
Todd Kennedy
c84bf8498e am a4911ed9: Merge "Verfiy global apps with device owner" into mnc-dev 
* commit 'a4911ed97102b638a373adcdae7e4c9b3c64cc30':
  Verfiy global apps with device owner
 2015-07-16 18:09:51 +00:00
Todd Kennedy
a4911ed971 Merge "Verfiy global apps with device owner" into mnc-dev 2015-07-16 17:59:35 +00:00
Dianne Hackborn
a7cfbe0e54 Work on issue #22516282: ChooserTarget URI grants not forwarded 
Add new option to startActivityAsCaller() which allows you to
specify that we should not do security checks on the target
activity being launched.

Change-Id: Ie6b28807b96fef35ccdff93b0a01066cfd8fa307
 2015-07-16 10:52:52 -07:00
Wale Ogunwale
fd2a5f1485 am 11813232: Merge "Animate app exit for cases where the app is already hidden before transition" into mnc-dev 
* commit '1181323230478e3027bbabbbaf769dcd4a11a0e4':
  Animate app exit for cases where the app is already hidden before transition
 2015-07-16 17:16:10 +00:00
John Reck
d5612d06c4 am ba4f0757: Merge "Don\'t crash on makeCurrent fail" into mnc-dev 
* commit 'ba4f0757779d6e91e52ebee0fd4c847b673a69e2':
  Don't crash on makeCurrent fail
 2015-07-16 17:01:22 +00:00
Wale Ogunwale
1181323230 Merge "Animate app exit for cases where the app is already hidden before transition" into mnc-dev 2015-07-16 17:01:15 +00:00
Alex Klyubin
c58153b2d7 HMAC keys are authorized for exactly one digest. 
This is in preparation for enforcing the minimum length of MACs
which in the case of HMAC keys generated or imported by Android
Keystore will be set to the length of the digest for which the
key is authorized.

Bug: 22337277
Change-Id: I0255d5ba184dabfb6b45d8f32ddadeb84ab7fc19
 2015-07-16 09:59:51 -07:00
Svet Ganov
9e136b88ba Return a result from Fragment#shouldShowRequestPermissionRationale 
bug:22523342

Change-Id: Ibacedec952316db705c57204fa448dbcada1c3e6
 2015-07-16 09:58:43 -07:00
John Reck
ba4f075777 Merge "Don't crash on makeCurrent fail" into mnc-dev 2015-07-16 16:50:30 +00:00
Wale Ogunwale
b60c0f616c Animate app exit for cases where the app is already hidden before transition 
It is possible for an app token to be marked as hidden and exiting
because the previous activity destory is completed before we are
good-to-go with app transition since we are still waiting for the
opening app to be done drawing. In this case we don't apply the
exiting animation since the token is not changing visibility state
during the app transition (it is already hidden and we are telling
it to hide...).
We now allow the animation to load if the token is already hidden
and marked as exiting.

Bug: 22381703
Change-Id: I5c27b6c3c1f810f05b2d716122055c6f12d0a167
 2015-07-16 09:45:35 -07:00
Todd Kennedy
633f199831 Verfiy global apps with device owner 
Applications installed for a specific user must be verfied as that user. However,
apps that are installed globally [i.e. UserHandle.ALL] should not be verified by
every user on the device. Instead, they should be verified by the device owner.

Bug: 21901423
Change-Id: I5fd3f690d08e7e911a3c86f09bbfcd4eb635b418
 2015-07-16 09:44:31 -07:00
John Reck
f2dcc2aecb Don't crash on makeCurrent fail 
Bug: 22444755

WindowManager may decide to yank the surface at any point, so
attempt to kinda handle this

Change-Id: Id2f665d2f0f93bccd4ec977fbf52dca4dc1ec891
 2015-07-16 09:17:59 -07:00