197316 Commits

Author SHA1 Message Date
Julia Reynolds
593aca12c2 Merge "Support 24 clock displays in demo mode." into mnc-dev 2015-07-17 15:54:10 +00:00
Todd Kennedy
5fe22e4fcb Merge "clear calling identity to dexopt" into mnc-dev 2015-07-17 14:40:00 +00:00
Lajos Molnar
e6b407b4be Merge "MediaSync: fix flush handling and deadlock" into mnc-dev 2015-07-17 13:24:27 +00:00
Dirk Dougherty
9349093cd9 am 86917496: am a7581335: Merge "Doc change: Update AFW behavior changes for Preview 2." into mnc-preview-docs
* commit '869174967f0efd011b503af5cc3445608667d81d':
  Doc change: Update AFW behavior changes for Preview 2.
2015-07-17 03:27:42 +00:00
Dirk Dougherty
869174967f am a7581335: Merge "Doc change: Update AFW behavior changes for Preview 2." into mnc-preview-docs
* commit 'a758133566e030275988fb3bf253a432e6803d8f':
  Doc change: Update AFW behavior changes for Preview 2.
2015-07-17 03:14:44 +00:00
Dirk Dougherty
a758133566 Merge "Doc change: Update AFW behavior changes for Preview 2." into mnc-preview-docs 2015-07-17 02:58:40 +00:00
Selim Cinek
b43b06d105 Merge "Fixed a bug where notifications were not posted on secondary users" into mnc-dev 2015-07-17 01:31:31 +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
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
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
9ba039bbe9 Merge "Update ChooserTarget constructor to take ComponentName, Bundle" into mnc-dev 2015-07-17 00:25:11 +00:00
Selim Cinek
f33b11182a Fixed a bug where notifications were not posted on secondary users
Unfortunately they made sound though, driving people crazy.

Bug: 22351758
Change-Id: I9ec5bac97c2d587c4e356ab759876def3369b11a
2015-07-16 17:24:51 -07: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
Lajos Molnar
d08debcf42 MediaSync: fix flush handling and deadlock
- clear pending video frames
- flush audio track
- reset clock
- restart audio track after flush
- don't hold lock during callback

Bug: 22234976
Change-Id: I681df950b67d7f9f77a9c5783279f1c8c91be856
2015-07-16 17:09:20 -07:00
Svet Ganov
6f561a24c9 Merge "Improve documentation of onRequestPermissionsResult" into mnc-dev 2015-07-16 23:51:53 +00:00
Todd Kennedy
2a89545739 clear calling identity to dexopt
Bug: 22067670
Change-Id: I3596f26a079660f6898401ed679463193b00c799
2015-07-16 16:39:46 -07: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
5aff3b5489 Merge "Maintain call time across SRVCC (2/3)." into mnc-dev 2015-07-16 23:09:19 +00:00
Dirk Dougherty
e74643d3d1 Doc change: Update AFW behavior changes for Preview 2.
Change-Id: I59216bb70448656a7eed38ba8c743b284eaf6300
2015-07-16 15:57:34 -07: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
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
aaee5b5334 Merge "Work on issue #22516282: ChooserTarget URI grants not forwarded" into mnc-dev 2015-07-16 21:44:21 +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
db8fa48ed0 Merge "Return a result from Fragment#shouldShowRequestPermissionRationale" into mnc-dev 2015-07-16 19:16:59 +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
Julia Reynolds
c11d838bc5 Support 24 clock displays in demo mode.
Bug: 22388468
Change-Id: I0a9f1c214a1612dbc225386ae8777a1480dd14b0
2015-07-16 14:40:37 -04: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
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
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
Tony Mak
532737df65 Merge "Fix calendar reminder notification is not shown in idle state" into mnc-dev 2015-07-16 14:50:19 +00:00
George Mount
bd87b6b5b0 Merge "Make additional shared elements a version-checked feature." into mnc-dev 2015-07-16 14:24:09 +00:00
George Mount
30c8245afc Merge "Add data binding to built javadoc." into mnc-dev 2015-07-16 14:19:12 +00:00
George Mount
2c256a04ae Make additional shared elements a version-checked feature.
Bug 22505481

ag/684544 added a feature to allow shared elements that weren't
shared into an Activity to be shared back. However, if you are
targeting an older version of the SDK, you may get an unexpected
shared element back. This change in behavior has been locked
behind a target version check.

Change-Id: I7162e24f3b14fedd6b308e89e9d04ac67660f7d6
2015-07-16 07:09:42 -07:00
Nicolas Prevot
dbdf7c4538 Don't send app links to the parent if status = never (part 2)
To qualify for cross-profile app linking, an intent should resolve
with a better status than "NEVER". Moved this check from canForwardTo
into the source method, getCrossProfileDomainPreferredLpr, to stop
bad resolutions leaking out.

BUG:22287521
Change-Id: I195979d78a783864d841a81f358780912bbf168e
2015-07-16 10:13:00 +01:00
Vineeta Srivastava
47e0409062 Merge "Remove redundant cancel events from FingerprintService" into mnc-dev 2015-07-16 07:06:54 +00:00