197296 Commits

Author SHA1 Message Date
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
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
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
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
Svet Ganov
7121e18595 Add APIs for verifier to grant at install and revoke permissions
bug:22231699

Change-Id: Ie0c758bf73699f50bf99ff5aa0bf98dcc9004e37
2015-07-15 22:22:59 -07:00
Sanket Padawe
ea975b122f Merge "Add new API for handling DB query per subId." into mnc-dev 2015-07-16 05:01:23 +00:00
Yohei Yukawa
c0aa9744dc Merge "PopupWindow position must be specified in window coordinates." into mnc-dev 2015-07-16 03:42:21 +00:00
Yohei Yukawa
ebbe77061c Merge "Fix comment bug in I71a8d356e868dc7715b030ca1078da4ec39368c3." into mnc-dev 2015-07-16 03:31:56 +00:00
Yohei Yukawa
4b26997eeb PopupWindow position must be specified in window coordinates.
This CL addresses TODOs in Ib641dda49f7ab1c7d60207c36a47767bb408.

With this CL the position of PopupWindow is always specified in
window-local coordinates even if FloatingToolbar#mParent is not a
decor view.

Bug: 22335001
Change-Id: I0cdd63a00051fa30981e517c07682075467ac598
2015-07-15 19:01:32 -07:00
Yohei Yukawa
9b9d2c572f Fix comment bug in I71a8d356e868dc7715b030ca1078da4ec39368c3.
This is a coment-only follow up CL for I71a8d356e868dc7715b030ca,
which wrongly changed coordinates from window-local to view-local
(relative to FloatingToolbar#mParent) when showing PopupWindow.

The position of PopupWindow still needs to be specified in
window-local coordinates as we had done before
I71a8d356e868dc7715b030ca1078da4ec39368c3.

Currently the problem might not be visible to users because
  1. FloatingToolbar is not a public API hence all the instances
     are under our controll.
  2. FloatingToolbar#mParent is alwasy initialized with
     PhoneWindow#getDecorView() for now.

Bug: 22335001
Change-Id: Ib641dda49f7ab1c7d60207c36a47767bb408971c
2015-07-15 19:00:18 -07:00
Jim Miller
80a776e5fe Remove redundant cancel events from FingerprintService
This fixes a bug where the framework was sending repeat cancel
events in response to terminal status (onAuthenticated(), onError())
which causes the underlying HAL implementation to get into a weird state.

Now, only client-initiated events like an explicit cancellation
or starting another authentication/enrollment invokes fingerprintd's
cancel() method.

Fixes bug 22438498

Change-Id: I762bab1c8635924848f9f4334db47a07130d5ae3
2015-07-15 18:57:14 -07:00
Chris Tate
a36c5580c5 Merge "Fix a bug disappearing installerPackageName info of packages after reboot." into mnc-dev 2015-07-16 01:18:06 +00:00
Deepanshu Gupta
a6ad75fbe0 Merge "Add tools:openDrawer to open a DrawerLayout." into mnc-dev 2015-07-16 00:59:36 +00:00
Deepanshu Gupta
4328626676 Merge "Change tools:list_item to listitem." into mnc-dev 2015-07-16 00:59:18 +00:00
Robert Schaub
a73face3f4 am 8c5f34de: am b53568f2: docs: Added word "video" to tv app quality guidelines.
* commit '8c5f34de91fc1fb148bbee9f868d32ff6103a70a':
  docs: Added word "video" to tv app quality guidelines.
2015-07-16 00:54:04 +00:00
Robert Schaub
8c5f34de91 am b53568f2: docs: Added word "video" to tv app quality guidelines.
* commit 'b53568f27c384523dae58af9f4ad355a6c72d6d7':
  docs: Added word "video" to tv app quality guidelines.
2015-07-16 00:43:26 +00:00
Jun Mukai
8703e50d13 Merge "Allow selecting quick setting items by keyboard." into mnc-dev 2015-07-16 00:37:18 +00:00
Oren Blasberg
84f8a09693 Merge "Make "dismiss all" button keyboard accessible." into mnc-dev 2015-07-16 00:29:35 +00:00
Adrian Roos
fc8e923d5e Merge "Fix wrong tint mode on airplane and vpn icons" into mnc-dev 2015-07-16 00:27:50 +00:00
Christopher Tate
3b1f8607fd Merge "Intent filters need CATEGORY_BROWSABLE to be app-linking eligible" into mnc-dev 2015-07-16 00:21:12 +00:00
hyemin.hwang
b4faf9810d Fix a bug disappearing installerPackageName info of packages after reboot.
If user install apps from playstore, system has installerPackageName attribute of app.
but, after reboot, some apps(have sharedUserID) installerPackageName attribute disappearing.
because lack of copy routine.
So, I added copy routine(installerPackageName).

Testcase :
1. Install app(has sharedUserId, ex Lync2013) from market.
2. Confirm package info from packages.xml(exist installer info).
3. reboot.
4. Re-confirm package info from packages.xml(not exist installer info).

Cherry-pick from AOSP master.
Bug 22513758

Change-Id: I3fea3e573c056f6c2f574715d2ebef4df8b75a68
2015-07-15 17:14:24 -07:00
Robert Schaub
31186713e9 docs: Added "location" before "gps" in list under "Declaring hardware ..."
Bug: 20106795

Change-Id: I13e7be98722ac56a9175b1456fc018ff665b77ab
2015-07-15 17:13:11 -07:00
Billy Lau
008409a2ea Merge "Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW..." into mnc-dev 2015-07-16 00:04:35 +00:00