OSDN Git Service
Jeff Sharkey [Fri, 17 Jul 2015 23:41:08 +0000 (23:41 +0000)]
am
2d9d5905: am
25945302: Merge "Persist version data on a per-volume basis." into mnc-dev
* commit '
2d9d59053fcb8504914f358a1417e67a94c0f8f1':
Persist version data on a per-volume basis.
xinhe [Fri, 17 Jul 2015 23:41:03 +0000 (23:41 +0000)]
am
9b8ddb09: am
822f6141: Merge "Add API to turn OFF "best network selection" feature" into mnc-dev
* commit '
9b8ddb09042c72f0c2ebfbf1a2e967e3677fa680':
Add API to turn OFF "best network selection" feature
Jeff Sharkey [Fri, 17 Jul 2015 23:31:39 +0000 (23:31 +0000)]
am
25945302: Merge "Persist version data on a per-volume basis." into mnc-dev
* commit '
259453024c015da9d70d1ffadba09604aa1c786e':
Persist version data on a per-volume basis.
xinhe [Fri, 17 Jul 2015 23:26:50 +0000 (23:26 +0000)]
am
822f6141: Merge "Add API to turn OFF "best network selection" feature" into mnc-dev
* commit '
822f6141d4aca099e1dc37cda3bc861b2908df82':
Add API to turn OFF "best network selection" feature
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
Svetoslav Ganov [Fri, 17 Jul 2015 23:05:33 +0000 (23:05 +0000)]
am
41ec3923: am
fbc6f2cb: Merge "Revert "Do not auto grant GET_ACCOUNTS as it is temporarily normal"" into mnc-dev
* commit '
41ec39230cd9c6b0d911f99854afc33dfc17e03d':
Revert "Do not auto grant GET_ACCOUNTS as it is temporarily normal"
Svetoslav Ganov [Fri, 17 Jul 2015 22:47:17 +0000 (22:47 +0000)]
am
fbc6f2cb: Merge "Revert "Do not auto grant GET_ACCOUNTS as it is temporarily normal"" into mnc-dev
* commit '
fbc6f2cb6c5313ac246b8554764a719dd06582fc':
Revert "Do not auto grant GET_ACCOUNTS as it is temporarily normal"
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
Dianne Hackborn [Fri, 17 Jul 2015 22:33:34 +0000 (22:33 +0000)]
am
fb03aa36: am
5c269121: Merge "Work on issue #
22556778: Starting under voice control not allowed" into mnc-dev
* commit '
fb03aa36a4790ca0ff5e11a56903507089278390':
Work on issue #
22556778: Starting under voice control not allowed
Dianne Hackborn [Fri, 17 Jul 2015 22:17:58 +0000 (22:17 +0000)]
am
5c269121: Merge "Work on issue #
22556778: Starting under voice control not allowed" into mnc-dev
* commit '
5c269121d8ea0bf3f530f2314695e189ffdb3165':
Work on issue #
22556778: Starting under voice control not allowed
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
Svet Ganov [Fri, 17 Jul 2015 21:22:39 +0000 (21:22 +0000)]
am
2d92575a: am
5ff4383b: Merge "Grant default permissions to default apps despite user choices." into mnc-dev
* commit '
2d92575ad0dbbf3bfee4f013f4b78fac06c0ab50':
Grant default permissions to default apps despite user choices.
Svet Ganov [Fri, 17 Jul 2015 21:10:16 +0000 (21:10 +0000)]
am
5ff4383b: Merge "Grant default permissions to default apps despite user choices." into mnc-dev
* commit '
5ff4383b466fc26e6696a7bbeb6df5eb7a3c8cc5':
Grant default permissions to default apps despite user choices.
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 20:46:01 +0000 (20:46 +0000)]
am
fa9a616d: am
4a1421f3: Merge "Do not auto grant GET_ACCOUNTS as it is temporarily normal" into mnc-dev
* commit '
fa9a616de9664c4bd7212683facbd31dcd9c3bdd':
Do not auto grant GET_ACCOUNTS as it is temporarily normal
ztenghui [Fri, 17 Jul 2015 20:45:56 +0000 (20:45 +0000)]
am
8b455841: am
094c82ad: Merge "Scaling (Animated)VectorDrawable inside ImageView" into mnc-dev
* commit '
8b455841d9da1ac5ddf1b88e03c0c94613fd4046':
Scaling (Animated)VectorDrawable inside ImageView
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:32:28 +0000 (20:32 +0000)]
am
4a1421f3: Merge "Do not auto grant GET_ACCOUNTS as it is temporarily normal" into mnc-dev
* commit '
4a1421f3c50d53a7e2230f41854df12215378ef2':
Do not auto grant GET_ACCOUNTS as it is temporarily normal
ztenghui [Fri, 17 Jul 2015 20:32:24 +0000 (20:32 +0000)]
am
094c82ad: Merge "Scaling (Animated)VectorDrawable inside ImageView" into mnc-dev
* commit '
094c82ada3799045588790252a64806b9930f8c2':
Scaling (Animated)VectorDrawable inside ImageView
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
Julia Reynolds [Fri, 17 Jul 2015 19:11:10 +0000 (19:11 +0000)]
am
e0746d32: am
3368e69e: Merge "Remove focusablilty of the status bar." into mnc-dev
* commit '
e0746d32306ff20d864b465ff1d6cd249daedb9d':
Remove focusablilty of the status bar.
Wale Ogunwale [Fri, 17 Jul 2015 19:11:06 +0000 (19:11 +0000)]
am
25257ca5: am
af814340: Merge "Fixed bad merge conflict resolution" into mnc-dev
* commit '
25257ca52e57b982ba71be040a7f261c66d37236':
Fixed bad merge conflict resolution
Mady Mellor [Fri, 17 Jul 2015 18:57:54 +0000 (18:57 +0000)]
am
9629f637: am
9c98b859: Merge "Update stylus gesture to access quick settings to use the new buttons" into mnc-dev
* commit '
9629f637b79d85f27efa224b208d8b3cfd2591a4':
Update stylus gesture to access quick settings to use the new buttons
Julia Reynolds [Fri, 17 Jul 2015 18:54:20 +0000 (18:54 +0000)]
am
3368e69e: Merge "Remove focusablilty of the status bar." into mnc-dev
* commit '
3368e69e9d7302ffb475a4ddd12bbb9ea8365a8d':
Remove focusablilty of the status bar.
Wale Ogunwale [Fri, 17 Jul 2015 18:54:16 +0000 (18:54 +0000)]
am
af814340: Merge "Fixed bad merge conflict resolution" into mnc-dev
* commit '
af81434023d19cfd486c84c210f2b6540a2bab35':
Fixed bad merge conflict resolution
Julia Reynolds [Fri, 17 Jul 2015 18:49:19 +0000 (18:49 +0000)]
Merge "Remove focusablilty of the status bar." into mnc-dev
Tingting Wang [Fri, 17 Jul 2015 18:45:41 +0000 (18:45 +0000)]
am
6aee4761: am
ad359f2e: Merge "Revert "Don\'t display Custom for PHONE_TYPE=CUSTOM part 1."" into mnc-dev
* commit '
6aee4761a826c3ef2793dc5c62d2451bd7450c61':
Revert "Don't display Custom for PHONE_TYPE=CUSTOM part 1."
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:44:51 +0000 (18:44 +0000)]
am
9c98b859: Merge "Update stylus gesture to access quick settings to use the new buttons" into mnc-dev
* commit '
9c98b859fd6aee74f23b66fccbd3bf2436efcdb9':
Update stylus gesture to access quick settings to use the new buttons
Tingting Wang [Fri, 17 Jul 2015 18:30:56 +0000 (18:30 +0000)]
am
ad359f2e: Merge "Revert "Don\'t display Custom for PHONE_TYPE=CUSTOM part 1."" into mnc-dev
* commit '
ad359f2e705280e26198890a95d53e3566126bcc':
Revert "Don't display Custom for PHONE_TYPE=CUSTOM part 1."
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 18:01:58 +0000 (18:01 +0000)]
am
098a88e6: am
2a500e32: Merge "Revert "Temporary lower GET_ACCOUNTS protection level"" into mnc-dev
* commit '
098a88e6a330c123c3daeda334e91c8656ecb4b2':
Revert "Temporary lower GET_ACCOUNTS protection level"
Svet Ganov [Fri, 17 Jul 2015 18:01:54 +0000 (18:01 +0000)]
am
7a8f2006: am
ecb88792: Merge "Temporary lower GET_ACCOUNTS protection level" into mnc-dev
* commit '
7a8f20065a777b130a1aa46dc2152e34190f1947':
Temporary lower GET_ACCOUNTS protection level
Svetoslav Ganov [Fri, 17 Jul 2015 17:47:54 +0000 (17:47 +0000)]
am
2a500e32: Merge "Revert "Temporary lower GET_ACCOUNTS protection level"" into mnc-dev
* commit '
2a500e32169b53679db83077e57f3c9cd02cfd36':
Revert "Temporary lower GET_ACCOUNTS protection level"
Svet Ganov [Fri, 17 Jul 2015 17:47:49 +0000 (17:47 +0000)]
am
ecb88792: Merge "Temporary lower GET_ACCOUNTS protection level" into mnc-dev
* commit '
ecb887925a3ff3d54ecb6593932d4f866a6fe9e9':
Temporary lower GET_ACCOUNTS protection level
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:20:09 +0000 (17:20 +0000)]
am
98977fa0: am
aa9a27bb: Merge "Camera2: Update FAST mode for EE and NR" into mnc-dev
* commit '
98977fa042deb2109d7869f6217447d0c4387e08':
Camera2: Update FAST mode for EE and NR
Eino-Ville Talvala [Fri, 17 Jul 2015 17:20:05 +0000 (17:20 +0000)]
am
69508f49: am
6e8a551f: Merge "Camera2: Add hidden experimental tearDown method" into mnc-dev
* commit '
69508f494e46d9055cb424d480bb48d433ad3462':
Camera2: Add hidden experimental tearDown method
Chien-Yu Chen [Fri, 17 Jul 2015 17:06:02 +0000 (17:06 +0000)]
am
aa9a27bb: Merge "Camera2: Update FAST mode for EE and NR" into mnc-dev
* commit '
aa9a27bb9bbfb4bccf999a0d453f4f4d853aac36':
Camera2: Update FAST mode for EE and NR
Eino-Ville Talvala [Fri, 17 Jul 2015 17:05:54 +0000 (17:05 +0000)]
am
6e8a551f: Merge "Camera2: Add hidden experimental tearDown method" into mnc-dev
* commit '
6e8a551f9f7691e3d7ada46eeae5d2cc612d7938':
Camera2: Add hidden experimental tearDown method
Nancy Chen [Fri, 17 Jul 2015 17:05:36 +0000 (17:05 +0000)]
am
ce9fea39: am
660322d8: Merge "Add transcription field to voicemail object and related changes." into mnc-dev
* commit '
ce9fea390c86f4e7725d2f7486cf97d56fdda5df':
Add transcription field to voicemail object and related changes.
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:50:52 +0000 (16:50 +0000)]
am
660322d8: Merge "Add transcription field to voicemail object and related changes." into mnc-dev
* commit '
660322d8259cb256745f15219af0b9004063ea8d':
Add transcription field to voicemail object and related changes.
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 [Fri, 17 Jul 2015 16:19:15 +0000 (16:19 +0000)]
am
3337693c: am
593aca12: Merge "Support 24 clock displays in demo mode." into mnc-dev
* commit '
3337693c784c2495c3563295687de7f8f764eaf1':
Support 24 clock displays in demo mode.
Julia Reynolds [Fri, 17 Jul 2015 16:01:55 +0000 (16:01 +0000)]
am
593aca12: Merge "Support 24 clock displays in demo mode." into mnc-dev
* commit '
593aca12c2f7bf39ca8d4ae944f36a88bd4a48cf':
Support 24 clock displays in demo mode.
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 15:02:52 +0000 (15:02 +0000)]
am
8c47b335: am
5fe22e4f: Merge "clear calling identity to dexopt" into mnc-dev
* commit '
8c47b335b0dd06efbcbf17e26df2be67a33a15f1':
clear calling identity to dexopt
Todd Kennedy [Fri, 17 Jul 2015 14:49:34 +0000 (14:49 +0000)]
am
5fe22e4f: Merge "clear calling identity to dexopt" into mnc-dev
* commit '
5fe22e4fcbc543aa588d739b2453b3fa72d31859':
clear calling identity to dexopt
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:48:46 +0000 (13:48 +0000)]
am
9628568a: am
e6b407b4: Merge "MediaSync: fix flush handling and deadlock" into mnc-dev
* commit '
9628568a22f2ff3c2aad53122987fb1dc5e0b618':
MediaSync: fix flush handling and deadlock
Lajos Molnar [Fri, 17 Jul 2015 13:36:20 +0000 (13:36 +0000)]
am
e6b407b4: Merge "MediaSync: fix flush handling and deadlock" into mnc-dev
* commit '
e6b407b4be0b9c8240d34259b14e324da4d6832b':
MediaSync: fix flush handling and deadlock
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:55:47 +0000 (03:55 +0000)]
am
092445e5: am
9349093c: am
86917496: am
a7581335: Merge "Doc change: Update AFW behavior changes for Preview 2." into mnc-preview-docs
* commit '
092445e51843533e1fae96a76e1439bef5c49366':
Doc change: Update AFW behavior changes for Preview 2.
Dirk Dougherty [Fri, 17 Jul 2015 03:40:50 +0000 (03:40 +0000)]
am
9349093c: am
86917496: am
a7581335: Merge "Doc change: Update AFW behavior changes for Preview 2." into mnc-preview-docs
* commit '
9349093cd984523a9d4bab397cd092b33c04f27e':
Doc change: Update AFW behavior changes for Preview 2.
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
Selim Cinek [Fri, 17 Jul 2015 01:54:26 +0000 (01:54 +0000)]
am
928b2bf7: am
b43b06d1: Merge "Fixed a bug where notifications were not posted on secondary users" into mnc-dev
* commit '
928b2bf7ae382ad34a741b6681d8c864ac457c4c':
Fixed a bug where notifications were not posted on secondary users
Selim Cinek [Fri, 17 Jul 2015 01:54:21 +0000 (01:54 +0000)]
am
2a10ff08: am
60e15dae: Merge "Fixed a bug where a fingerprint animation was not running" into mnc-dev
* commit '
2a10ff0893ea642316af983b8a0c39b749020c25':
Fixed a bug where a fingerprint animation was not running
Selim Cinek [Fri, 17 Jul 2015 01:40:06 +0000 (01:40 +0000)]
am
b43b06d1: Merge "Fixed a bug where notifications were not posted on secondary users" into mnc-dev
* commit '
b43b06d1056031444596edcc27a1a10084e5cad3':
Fixed a bug where notifications were not posted on secondary users
Selim Cinek [Fri, 17 Jul 2015 01:40:01 +0000 (01:40 +0000)]
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
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
Jae Seo [Fri, 17 Jul 2015 01:25:52 +0000 (01:25 +0000)]
am
25cb2b99: am
d19ed4c1: Merge "TIF: Avoid generating locale dependent input IDs" into mnc-dev
* commit '
25cb2b99e6afe47b2d85cddc0ac698aa9fe67e4b':
TIF: Avoid generating locale dependent input IDs
Dan Sandler [Fri, 17 Jul 2015 01:25:49 +0000 (01:25 +0000)]
am
8f895de9: am
86647987: Icon-related Notifications API changes:
* commit '
8f895de9f43f661218fcc519d3722c0af5e5488b':
Icon-related Notifications API changes:
Adrian Roos [Fri, 17 Jul 2015 01:11:37 +0000 (01:11 +0000)]
am
6893aeee: am
5536bb48: Merge "Fix stuck scrim on keyguard-less devices" into mnc-dev
* commit '
6893aeee48adc1f8b8aebde5e21b7e1294acfaf2':
Fix stuck scrim on keyguard-less devices
Jae Seo [Fri, 17 Jul 2015 01:09:52 +0000 (01:09 +0000)]
am
d19ed4c1: Merge "TIF: Avoid generating locale dependent input IDs" into mnc-dev
* commit '
d19ed4c16d0c11bb68dd3a7aab0fb1845814dac8':
TIF: Avoid generating locale dependent input IDs
Dan Sandler [Fri, 17 Jul 2015 01:09:48 +0000 (01:09 +0000)]
am
86647987: Icon-related Notifications API changes:
* commit '
86647987c3c6bf4e6a8bacd763ff16f1806c70a3':
Icon-related Notifications API changes:
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
Adrian Roos [Fri, 17 Jul 2015 00:56:20 +0000 (00:56 +0000)]
am
5536bb48: Merge "Fix stuck scrim on keyguard-less devices" into mnc-dev
* commit '
5536bb48b2829f04f9a8258bfe698e5e4a26f234':
Fix stuck scrim on keyguard-less devices
Adam Powell [Fri, 17 Jul 2015 00:50:06 +0000 (00:50 +0000)]
am
2fca4812: am
9ba039bb: Merge "Update ChooserTarget constructor to take ComponentName, Bundle" into mnc-dev
* commit '
2fca4812336476e7c000214109b6c06b401986c2':
Update ChooserTarget constructor to take ComponentName, Bundle
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:32:58 +0000 (00:32 +0000)]
am
9ba039bb: Merge "Update ChooserTarget constructor to take ComponentName, Bundle" into mnc-dev
* commit '
9ba039bbe9478c56ae3875a9933d3ba754367dc2':
Update ChooserTarget constructor to take ComponentName, Bundle
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
Svet Ganov [Fri, 17 Jul 2015 00:19:30 +0000 (00:19 +0000)]
am
b0f8fee8: am
6f561a24: Merge "Improve documentation of onRequestPermissionsResult" into mnc-dev
* commit '
b0f8fee845fa2e41ea1e003e413c3df59d641137':
Improve documentation of onRequestPermissionsResult
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 [Fri, 17 Jul 2015 00:03:30 +0000 (00:03 +0000)]
am
6f561a24: Merge "Improve documentation of onRequestPermissionsResult" into mnc-dev
* commit '
6f561a24c97d25a858cf98eef5c502ef8d80cfc1':
Improve documentation of onRequestPermissionsResult
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