OSDN Git Service
Ricardo Garcia [Mon, 20 Jul 2015 18:03:41 +0000 (18:03 +0000)]
Merge "Fix for MidiManager bug" into mnc-dev
Billy Lau [Mon, 20 Jul 2015 17:57:25 +0000 (17:57 +0000)]
Merge "Bug:
22598083 Document how apps can detect WRITE_SETTINGS or SYSTEM_ALERT_WINDOW through AppOps" into mnc-dev
Jeff Sharkey [Mon, 20 Jul 2015 17:37:06 +0000 (17:37 +0000)]
Merge "Better logging of MediaPlayer failure reason." into mnc-dev
Billy Lau [Mon, 20 Jul 2015 16:34:09 +0000 (17:34 +0100)]
Bug:
22598083 Document how apps can detect WRITE_SETTINGS or SYSTEM_ALERT_WINDOW
through AppOps
Expose OP_STR strings that describes the ops for WRITE_SETTINGS and
SYSTEM_ALERT_WINDOW permissions such that apps can query AppOpsManager
whether this capability is turned on or off by the user.
Change-Id: I0e7a6f39e02389290232e450624b40ffb255abfb
Jean-Michel Trivi [Mon, 20 Jul 2015 17:25:27 +0000 (17:25 +0000)]
Merge "Media button intent should be send to current user only." into mnc-dev
Christopher Tate [Mon, 20 Jul 2015 17:05:27 +0000 (17:05 +0000)]
Merge "Don't fall back to domain verification state when looking up app linkage state" into mnc-dev
Jeff Sharkey [Mon, 20 Jul 2015 16:38:02 +0000 (09:38 -0700)]
Better logging of MediaPlayer failure reason.
Otherwise exception details are dropped on the floor, making it
hard to debug.
Bug:
22525550
Change-Id: I6ab9eb8461a23b9d9b8a0ea6dd1ae8ee2495dd01
Jorim Jaggi [Fri, 17 Jul 2015 19:00:34 +0000 (12:00 -0700)]
Adjust fingerprint icon placement to spec
Bug:
22502068
Change-Id: I12952cb1ea43f365d5a63ec2636a5d60a981b93f
Chris Craik [Fri, 17 Jul 2015 23:59:14 +0000 (23:59 +0000)]
Merge "Fix AssetAtlas usage in BitmapShaders" into mnc-dev
Adrian Roos [Fri, 17 Jul 2015 23:29:56 +0000 (23:29 +0000)]
Merge "Fix image wallpaper size" into mnc-dev
Jeff Sharkey [Fri, 17 Jul 2015 23:29:51 +0000 (23:29 +0000)]
Merge "Clear identity when killing media provider." into mnc-dev
Chet Haase [Fri, 17 Jul 2015 23:27:54 +0000 (23:27 +0000)]
Merge "Localize SimpleMonthView" into mnc-dev
Jeff Sharkey [Fri, 17 Jul 2015 22:12:39 +0000 (15:12 -0700)]
Clear identity when killing media provider.
Otherwise various shell "sm" commands fail because they don't hold
the right permissions.
Bug:
22564405
Change-Id: I88081e8a9b27ee43904d3ea6f745aba3af4e2150
Jeff Sharkey [Fri, 17 Jul 2015 23:20:35 +0000 (23:20 +0000)]
Merge "Persist version data on a per-volume basis." into mnc-dev
Jeff Sharkey [Fri, 17 Jul 2015 21:56:34 +0000 (14:56 -0700)]
Persist version data on a per-volume basis.
Now that we support multiple adopted external storage devices, we
need to keep track of version data for each volume. This means we
now correctly handle certificate upgrade edge cases, permission
regranting, and clearing of code caches on a per-volume basis.
Bug:
22298966
Change-Id: Ifb9940c197f6c058a3ecca728257f853ce0fd7f4
xinhe [Fri, 17 Jul 2015 23:13:03 +0000 (23:13 +0000)]
Merge "Add API to turn OFF "best network selection" feature" into mnc-dev
Chris Craik [Fri, 17 Jul 2015 22:51:36 +0000 (15:51 -0700)]
Fix AssetAtlas usage in BitmapShaders
bug:
22521999
Change-Id: I60859748ceee19ebc89ec98845e550ea26e36ecd
Svetoslav Ganov [Fri, 17 Jul 2015 22:39:29 +0000 (22:39 +0000)]
Merge "Revert "Do not auto grant GET_ACCOUNTS as it is temporarily normal"" into mnc-dev
Christopher Tate [Fri, 17 Jul 2015 22:39:08 +0000 (15:39 -0700)]
Don't fall back to domain verification state when looking up app linkage state
This is in support of the always/never/ask UI tweaks in Settings: any
"assume always" fallback at the verification layer should not be
conflated with the user-facing semantic toggle. This was causing the
UI to report apps as being in the 'always open their links' state
inappropriately.
Bug
22532193
Change-Id: Iaa4bc3a2d5db814e1b0d96bc1c4ecfaafb1e3105
Dianne Hackborn [Fri, 17 Jul 2015 22:03:44 +0000 (22:03 +0000)]
Merge "Work on issue #
22556778: Starting under voice control not allowed" into mnc-dev
Chet Haase [Fri, 17 Jul 2015 19:42:08 +0000 (12:42 -0700)]
Localize SimpleMonthView
The days of the month were not being localized, resulting in
English numbers for non-English languages. Now we format the numbers
with the current locale.
Issue #
22540629 [MRA14D][Arab][Token] numbers displayed in english
Change-Id: I2b17d55ba2d0aa47b5a28c8846c6cf9723ababb1
Svet Ganov [Fri, 17 Jul 2015 20:58:11 +0000 (20:58 +0000)]
Merge "Grant default permissions to default apps despite user choices." into mnc-dev
Svet Ganov [Fri, 17 Jul 2015 01:56:16 +0000 (18:56 -0700)]
Grant default permissions to default apps despite user choices.
This implements the policy of granting default permissions to default
apps upon a selection despite past user permission choices. The act of
picking the app as the default one means the user expects it to work in
this capacity as SMS app, Phone app, Browser app.
bug:
22062549
Change-Id: I5e427f2b939e85bb8bbfd311cc271b96857a7ce6
Svetoslav Ganov [Fri, 17 Jul 2015 20:34:18 +0000 (20:34 +0000)]
Revert "Do not auto grant GET_ACCOUNTS as it is temporarily normal"
This reverts commit
33852d8cd21434b4106b8f2c504752ef34abb2da.
Change-Id: I29a212876c93ae0288967ffcff223abafad78827
Svet Ganov [Fri, 17 Jul 2015 20:27:33 +0000 (20:27 +0000)]
Merge "Do not auto grant GET_ACCOUNTS as it is temporarily normal" into mnc-dev
Svet Ganov [Fri, 17 Jul 2015 20:21:32 +0000 (13:21 -0700)]
Do not auto grant GET_ACCOUNTS as it is temporarily normal
bug:
22550851
Change-Id: Iea5dd8fde07074220167a937b32208b1c9488d9d
ztenghui [Fri, 17 Jul 2015 20:21:14 +0000 (20:21 +0000)]
Merge "Scaling (Animated)VectorDrawable inside ImageView" into mnc-dev
Adrian Roos [Fri, 17 Jul 2015 19:29:53 +0000 (12:29 -0700)]
Fix image wallpaper size
Fixes a bug where the image wallpaper size
would not correctly update. Suspected cause
is checking the to-be-requested size against
the current surface size instead of the
requested surface size.
Also removes an unused field.
Bug:
21148936
Change-Id: Ief4585bd5aed5922337709d7ae0ca0bf948649d0
Julia Reynolds [Fri, 17 Jul 2015 18:49:19 +0000 (18:49 +0000)]
Merge "Remove focusablilty of the status bar." into mnc-dev
Wale Ogunwale [Fri, 17 Jul 2015 18:44:55 +0000 (18:44 +0000)]
Merge "Fixed bad merge conflict resolution" into mnc-dev
Mady Mellor [Fri, 17 Jul 2015 18:30:48 +0000 (18:30 +0000)]
Merge "Update stylus gesture to access quick settings to use the new buttons" into mnc-dev
Dianne Hackborn [Fri, 17 Jul 2015 18:21:26 +0000 (11:21 -0700)]
Work on issue #
22556778: Starting under voice control not allowed
The ResolverActivity is voice capable. In fact, it is capable
of EVERYTHING.
Change-Id: I37c4476d546f61fee3540b747aff77e88b702d48
Tingting Wang [Fri, 17 Jul 2015 18:19:54 +0000 (18:19 +0000)]
Merge "Revert "Don't display Custom for PHONE_TYPE=CUSTOM part 1."" into mnc-dev
ztenghui [Wed, 14 Jan 2015 00:21:11 +0000 (16:21 -0800)]
Scaling (Animated)VectorDrawable inside ImageView
Before, the VectorDrawable is behaving like BitmapDrawable inside a ImageView,
and it can be blurry due to scaling.
Now apply the scaling information to the cached bitmap, then the size of bitmap
will match the ImageView's screen size. Therefore, no blurry any more.
b/
18185626
Change-Id: I979cef3b5178a9bd37ee6cc776df3361ca47c803
Svetoslav Ganov [Fri, 17 Jul 2015 17:36:54 +0000 (17:36 +0000)]
Merge "Revert "Temporary lower GET_ACCOUNTS protection level"" into mnc-dev
Svetoslav Ganov [Fri, 17 Jul 2015 17:35:05 +0000 (17:35 +0000)]
Revert "Temporary lower GET_ACCOUNTS protection level"
This reverts commit
6e20ac343c22ab27e5ac7471bc1219df6bf11282.
Change-Id: I96b21bad9406abffa95c90abde509dc8dcf3eff5
Svet Ganov [Fri, 17 Jul 2015 17:34:14 +0000 (17:34 +0000)]
Merge "Temporary lower GET_ACCOUNTS protection level" into mnc-dev
Svet Ganov [Fri, 17 Jul 2015 17:24:37 +0000 (10:24 -0700)]
Temporary lower GET_ACCOUNTS protection level
bug:
22550851
Change-Id: If43f10639220f9a69d304b08def6d869658c2960
Chien-Yu Chen [Fri, 17 Jul 2015 17:01:21 +0000 (17:01 +0000)]
Merge "Camera2: Update FAST mode for EE and NR" into mnc-dev
Eino-Ville Talvala [Fri, 17 Jul 2015 16:53:58 +0000 (16:53 +0000)]
Merge "Camera2: Add hidden experimental tearDown method" into mnc-dev
Nancy Chen [Fri, 17 Jul 2015 16:37:39 +0000 (16:37 +0000)]
Merge "Add transcription field to voicemail object and related changes." into mnc-dev
Julia Reynolds [Thu, 16 Jul 2015 16:18:43 +0000 (12:18 -0400)]
Remove focusablilty of the status bar.
This allows TTS readers to announce individual items in
the status bar separately.
Bug:
20536376
Change-Id: I88d9e2b72182814bf8906951b97871ddc697c5e0
Julia Reynolds [Fri, 17 Jul 2015 15:54:03 +0000 (15:54 +0000)]
Merge "Support 24 clock displays in demo mode." into mnc-dev
Todd Kennedy [Fri, 17 Jul 2015 14:39:57 +0000 (14:39 +0000)]
Merge "clear calling identity to dexopt" into mnc-dev
Wale Ogunwale [Fri, 17 Jul 2015 14:20:57 +0000 (07:20 -0700)]
Fixed bad merge conflict resolution
https://android-review.googlesource.com/#/c/137534/ was accepted
and merged on 03/04/15. However, a bad merge conflict resolution
caused half of the change to be reverted. This adds back the missing
change.
Change-Id: I4f7c2503e60321b692e12316961958b149baf4ea
Lajos Molnar [Fri, 17 Jul 2015 13:24:15 +0000 (13:24 +0000)]
Merge "MediaSync: fix flush handling and deadlock" into mnc-dev
Dirk Dougherty [Fri, 17 Jul 2015 03:27:42 +0000 (03:27 +0000)]
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.
Dirk Dougherty [Fri, 17 Jul 2015 03:14:44 +0000 (03:14 +0000)]
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.
Dirk Dougherty [Fri, 17 Jul 2015 02:58:37 +0000 (02:58 +0000)]
Merge "Doc change: Update AFW behavior changes for Preview 2." into mnc-preview-docs
Nancy Chen [Fri, 17 Jul 2015 01:36:58 +0000 (18:36 -0700)]
Add transcription field to voicemail object and related changes.
Bug:
22542002
Change-Id: I05c18e8f82a4f318fb59228e4d6eb844d64bee30
Selim Cinek [Fri, 17 Jul 2015 01:31:29 +0000 (01:31 +0000)]
Merge "Fixed a bug where notifications were not posted on secondary users" into mnc-dev
Selim Cinek [Fri, 17 Jul 2015 01:29:26 +0000 (01:29 +0000)]
Merge "Fixed a bug where a fingerprint animation was not running" into mnc-dev
Ricardo Garcia [Fri, 17 Jul 2015 01:20:46 +0000 (18:20 -0700)]
Fix for MidiManager bug
Returning null if MidiManager service can't be created instead
of crashing with NPE.
bug:
22087661
Change-Id: Ia27835ea1197af2db04c3e7f1d2e7c9f32fddbd0
Jae Seo [Fri, 17 Jul 2015 01:07:00 +0000 (01:07 +0000)]
Merge "TIF: Avoid generating locale dependent input IDs" into mnc-dev
Dan Sandler [Thu, 14 May 2015 03:41:13 +0000 (23:41 -0400)]
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
Jae Seo [Fri, 17 Jul 2015 00:48:55 +0000 (17:48 -0700)]
TIF: Avoid generating locale dependent input IDs
Bug:
22519551
Change-Id: Id818f075fa4863b6e1a6f707e0debe8f08973f25
Adrian Roos [Fri, 17 Jul 2015 00:43:16 +0000 (00:43 +0000)]
Merge "Fix stuck scrim on keyguard-less devices" into mnc-dev
Adam Powell [Fri, 17 Jul 2015 00:25:09 +0000 (00:25 +0000)]
Merge "Update ChooserTarget constructor to take ComponentName, Bundle" into mnc-dev
Selim Cinek [Thu, 16 Jul 2015 00:45:11 +0000 (17:45 -0700)]
Fixed a bug where notifications were not posted on secondary users
Unfortunately they made sound though, driving people crazy.
Bug:
22351758
Change-Id: I9ec5bac97c2d587c4e356ab759876def3369b11a
Selim Cinek [Wed, 15 Jul 2015 20:24:06 +0000 (13:24 -0700)]
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
Lajos Molnar [Wed, 1 Jul 2015 23:35:49 +0000 (16:35 -0700)]
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
Svet Ganov [Thu, 16 Jul 2015 23:51:50 +0000 (23:51 +0000)]
Merge "Improve documentation of onRequestPermissionsResult" into mnc-dev
Todd Kennedy [Thu, 16 Jul 2015 23:39:46 +0000 (16:39 -0700)]
clear calling identity to dexopt
Bug:
22067670
Change-Id: I3596f26a079660f6898401ed679463193b00c799
Adam Powell [Thu, 16 Jul 2015 03:14:57 +0000 (20:14 -0700)]
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
Svet Ganov [Thu, 16 Jul 2015 23:28:51 +0000 (16:28 -0700)]
Improve documentation of onRequestPermissionsResult
bug:
22524902
Change-Id: Ic435171fa016d8841bea432c5c39d7b0a6a7b9e9
Roshan Pius [Thu, 16 Jul 2015 23:09:14 +0000 (23:09 +0000)]
Merge "Maintain call time across SRVCC (2/3)." into mnc-dev
Dirk Dougherty [Thu, 16 Jul 2015 22:13:08 +0000 (15:13 -0700)]
Doc change: Update AFW behavior changes for Preview 2.
Change-Id: I59216bb70448656a7eed38ba8c743b284eaf6300
Alex Klyubin [Thu, 16 Jul 2015 22:40:02 +0000 (22:40 +0000)]
Merge "HMAC keys are authorized for exactly one digest." into mnc-dev
Svet Ganov [Thu, 16 Jul 2015 22:21:59 +0000 (22:21 +0000)]
Merge "Add APIs for verifier to grant at install and revoke permissions" into mnc-dev
Chris Craik [Thu, 16 Jul 2015 22:11:38 +0000 (22:11 +0000)]
Merge "Fix clip area behavior for REPLACE op" into mnc-dev
Eino-Ville Talvala [Wed, 15 Jul 2015 23:04:04 +0000 (16:04 -0700)]
Camera2: Add hidden experimental tearDown method
Bug:
18949148
Change-Id: I6264d95a26ebf51cce6114c9a86b9561f7c60ab5
Dianne Hackborn [Thu, 16 Jul 2015 21:44:18 +0000 (21:44 +0000)]
Merge "Work on issue #
22516282: ChooserTarget URI grants not forwarded" into mnc-dev
Tingting Wang [Thu, 16 Jul 2015 21:19:28 +0000 (21:19 +0000)]
Revert "Don't display Custom for PHONE_TYPE=CUSTOM part 1."
This reverts commit
d55b348e629d5ae5a2efbba6735be4b30220e50b.
Change-Id: I3e623de725c419489294aed6c3b3aea838fc0f7b
Makoto Onuki [Thu, 16 Jul 2015 21:01:37 +0000 (21:01 +0000)]
Merge "DefaultPermission: GET_ACCOUNTS is now in CONTACTS" into mnc-dev
Chris Craik [Thu, 16 Jul 2015 20:07:45 +0000 (13:07 -0700)]
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
Svet Ganov [Thu, 16 Jul 2015 19:16:54 +0000 (19:16 +0000)]
Merge "Return a result from Fragment#shouldShowRequestPermissionRationale" into mnc-dev
Robert Schaub [Thu, 16 Jul 2015 18:57:39 +0000 (18:57 +0000)]
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 ..."
Julia Reynolds [Thu, 16 Jul 2015 18:40:37 +0000 (14:40 -0400)]
Support 24 clock displays in demo mode.
Bug:
22388468
Change-Id: I0a9f1c214a1612dbc225386ae8777a1480dd14b0
Robert Schaub [Thu, 16 Jul 2015 18:40:37 +0000 (18:40 +0000)]
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 ..."
Makoto Onuki [Thu, 16 Jul 2015 18:38:00 +0000 (11:38 -0700)]
DefaultPermission: GET_ACCOUNTS is now in CONTACTS
Bug
22532312
Change-Id: If7ad0faa3a196bb28da1ddc13788c0430df1d1ee
Dianne Hackborn [Thu, 16 Jul 2015 18:31:14 +0000 (18:31 +0000)]
Merge "Don't spam the system with unique wake lock names." into mnc-dev
Robert Schaub [Thu, 16 Jul 2015 18:21:19 +0000 (18:21 +0000)]
Merge "docs: Added "location" before "gps" in list under "Declaring hardware ..."" into mnc-preview-docs
Todd Kennedy [Thu, 16 Jul 2015 17:59:32 +0000 (17:59 +0000)]
Merge "Verfiy global apps with device owner" into mnc-dev
Dianne Hackborn [Thu, 16 Jul 2015 17:52:52 +0000 (10:52 -0700)]
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
Wale Ogunwale [Thu, 16 Jul 2015 17:00:58 +0000 (17:00 +0000)]
Merge "Animate app exit for cases where the app is already hidden before transition" into mnc-dev
Alex Klyubin [Wed, 8 Jul 2015 16:31:23 +0000 (09:31 -0700)]
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
Svet Ganov [Thu, 16 Jul 2015 16:58:38 +0000 (09:58 -0700)]
Return a result from Fragment#shouldShowRequestPermissionRationale
bug:
22523342
Change-Id: Ibacedec952316db705c57204fa448dbcada1c3e6
John Reck [Thu, 16 Jul 2015 16:50:28 +0000 (16:50 +0000)]
Merge "Don't crash on makeCurrent fail" into mnc-dev
Wale Ogunwale [Thu, 16 Jul 2015 16:45:35 +0000 (09:45 -0700)]
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
Todd Kennedy [Thu, 16 Jul 2015 16:44:31 +0000 (09:44 -0700)]
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
John Reck [Thu, 16 Jul 2015 16:17:59 +0000 (09:17 -0700)]
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
Tony Mak [Thu, 16 Jul 2015 14:50:16 +0000 (14:50 +0000)]
Merge "Fix calendar reminder notification is not shown in idle state" into mnc-dev
George Mount [Thu, 16 Jul 2015 14:24:06 +0000 (14:24 +0000)]
Merge "Make additional shared elements a version-checked feature." into mnc-dev
George Mount [Thu, 16 Jul 2015 14:19:08 +0000 (14:19 +0000)]
Merge "Add data binding to built javadoc." into mnc-dev
George Mount [Wed, 15 Jul 2015 23:30:20 +0000 (16:30 -0700)]
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
Nicolas Prevot [Wed, 15 Jul 2015 13:54:45 +0000 (14:54 +0100)]
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
Vineeta Srivastava [Thu, 16 Jul 2015 07:06:52 +0000 (07:06 +0000)]
Merge "Remove redundant cancel events from FingerprintService" into mnc-dev
Svet Ganov [Tue, 14 Jul 2015 05:38:12 +0000 (22:38 -0700)]
Add APIs for verifier to grant at install and revoke permissions
bug:
22231699
Change-Id: Ie0c758bf73699f50bf99ff5aa0bf98dcc9004e37
Sanket Padawe [Thu, 16 Jul 2015 05:01:06 +0000 (05:01 +0000)]
Merge "Add new API for handling DB query per subId." into mnc-dev
Yohei Yukawa [Thu, 16 Jul 2015 03:42:17 +0000 (03:42 +0000)]
Merge "PopupWindow position must be specified in window coordinates." into mnc-dev