OSDN Git Service
Doris Liu [Thu, 7 Jan 2016 22:24:57 +0000 (14:24 -0800)]
Get animation update timing for AVD
The goal for this change is to get the timing for animation update. Since
AnimatorSet does not support update listeners, we have to go with the a different
approach, which sets up a value animator that runs between the start and end of
the AnimatorSet. We can then get the animation update timing from the ValueAnimator.
Bug:
26329675
Change-Id: Ibe7fce81eb6da5e05c87a732c1d3bc904b4e5e6f
(cherry picked from commit I378a0964da8f7090f65f6b56275a302e30668835)
Sungmin Choi [Wed, 23 Dec 2015 05:10:41 +0000 (14:10 +0900)]
Add carrier config variable to support editable wfc mode
Some operators support Wi-Fi Calling only, not VoLTE.
They don't need "Cellular preferred" option.
In this case, set uneditalbe attribute for preferred preference.
Bug:
26299288
Change-Id: I58b44bbd85bb5ef436d32a5e34d7372532695b91
Geoff Mendal [Mon, 11 Jan 2016 15:51:36 +0000 (15:51 +0000)]
Merge "Revert "Import translations. DO NOT MERGE"" into lmp-mr1-ub-dev am:
66841a62f1 -s ours am:
73992aee94 -s ours am:
0663959eb7 -s ours
am:
8635657b17 -s ours
* commit '
8635657b176ee9f80e8f57a7d1da9278722ff8a0':
Revert "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 11 Jan 2016 15:46:49 +0000 (15:46 +0000)]
Merge "Revert "Import translations. DO NOT MERGE"" into lmp-mr1-ub-dev am:
66841a62f1 -s ours am:
73992aee94 -s ours
am:
0663959eb7 -s ours
* commit '
0663959eb73127a49d0a72a70000f3b092adc3e6':
Revert "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 11 Jan 2016 15:42:10 +0000 (15:42 +0000)]
Merge "Revert "Import translations. DO NOT MERGE"" into lmp-mr1-ub-dev am:
66841a62f1 -s ours
am:
73992aee94 -s ours
* commit '
73992aee94ce78b8827fe05bb5537068a96c835d':
Revert "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 11 Jan 2016 15:37:27 +0000 (15:37 +0000)]
Merge "Revert "Import translations. DO NOT MERGE"" into lmp-mr1-ub-dev
am:
66841a62f1 -s ours
* commit '
66841a62f1d71eba843e69d1c8b5ca9453c5b42b':
Revert "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 11 Jan 2016 15:33:48 +0000 (15:33 +0000)]
Merge "Revert "Import translations. DO NOT MERGE"" into lmp-mr1-ub-dev
Geoff Mendal [Mon, 11 Jan 2016 15:33:28 +0000 (15:33 +0000)]
Revert "Import translations. DO NOT MERGE"
This reverts commit
a4505e926410cbf20dcd301f35f3496628cad9de.
Change-Id: I5929282b07b1df7a3d618e3be00974609cfcc5cf
Geoff Mendal [Mon, 11 Jan 2016 14:57:38 +0000 (14:57 +0000)]
Merge branch 'mnc-dr1.5-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-dr1.5-dev
Geoff Mendal [Mon, 11 Jan 2016 14:57:07 +0000 (14:57 +0000)]
Revert "Import translations. DO NOT MERGE" am:
8874f9754f -s ours am:
4df8f4abe0 -s ours am:
009fb756ec -s ours am:
b409a99ccc -s ours am:
14c37a57ea -s ours am:
0b8de39728 -s ours
am:
9f094ac04d -s ours
* commit '
9f094ac04d55cc3a2da2038cc3f3e46dc472269b':
Revert "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 11 Jan 2016 14:56:01 +0000 (14:56 +0000)]
Revert "Import translations. DO NOT MERGE" am:
8874f9754f -s ours am:
4df8f4abe0 -s ours am:
009fb756ec -s ours am:
b409a99ccc -s ours am:
14c37a57ea -s ours am:
0b8de39728 -s ours
am:
9f094ac04d -s ours
* commit '
9f094ac04d55cc3a2da2038cc3f3e46dc472269b':
Revert "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 11 Jan 2016 14:54:39 +0000 (14:54 +0000)]
Import translations. DO NOT MERGE am:
9f9e736e0d -s ours am:
b441c6926b -s ours am:
83bf32ebe5 -s ours am:
42692affe2 -s ours am:
8ea585955c -s ours am:
4ae777097e -s ours
am:
23c92d99cf -s ours
* commit '
23c92d99cf4f613f212710e73bb46c9c5895918f':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 11 Jan 2016 14:52:22 +0000 (14:52 +0000)]
Revert "Import translations. DO NOT MERGE" am:
8874f9754f -s ours am:
4df8f4abe0 -s ours am:
009fb756ec -s ours am:
b409a99ccc -s ours am:
14c37a57ea -s ours
am:
0b8de39728 -s ours
* commit '
0b8de39728014ad51ff6784a3850a3d752f715e3':
Revert "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 11 Jan 2016 14:50:39 +0000 (14:50 +0000)]
Import translations. DO NOT MERGE am:
9f9e736e0d -s ours am:
b441c6926b -s ours am:
83bf32ebe5 -s ours am:
42692affe2 -s ours am:
8ea585955c -s ours
am:
4ae777097e -s ours
* commit '
4ae777097e4242e546c0b7e477cbd0829689dff5':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 11 Jan 2016 14:45:46 +0000 (14:45 +0000)]
Revert "Import translations. DO NOT MERGE" am:
8874f9754f -s ours am:
4df8f4abe0 -s ours am:
009fb756ec -s ours am:
b409a99ccc -s ours
am:
14c37a57ea -s ours
* commit '
14c37a57eaf9fe962fe7ee9ecb33bc883ededf7b':
Revert "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 11 Jan 2016 14:41:17 +0000 (14:41 +0000)]
Revert "Import translations. DO NOT MERGE" am:
8874f9754f -s ours am:
4df8f4abe0 -s ours am:
009fb756ec -s ours
am:
b409a99ccc -s ours
* commit '
b409a99ccc0a42814f3918c689d06526c09f726b':
Revert "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 11 Jan 2016 14:36:52 +0000 (14:36 +0000)]
Revert "Import translations. DO NOT MERGE" am:
8874f9754f -s ours am:
4df8f4abe0 -s ours
am:
009fb756ec -s ours
* commit '
009fb756ecabd78e5300c619c267f2e55cfd0922':
Revert "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 11 Jan 2016 14:32:35 +0000 (14:32 +0000)]
Revert "Import translations. DO NOT MERGE" am:
8874f9754f -s ours
am:
4df8f4abe0 -s ours
* commit '
4df8f4abe076d870b0e406efcd9c2d7cb6e4c81f':
Revert "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 11 Jan 2016 14:28:57 +0000 (14:28 +0000)]
Revert "Import translations. DO NOT MERGE"
am:
8874f9754f -s ours
* commit '
8874f9754f909dafcc2c5c23109e35297263f469':
Revert "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 11 Jan 2016 14:28:55 +0000 (14:28 +0000)]
Revert "Import translations. DO NOT MERGE" am:
9e5fe1a7da -s ours am:
1c51eb41ee -s ours am:
eab7785333 -s ours
am:
2ed7b6d82a -s ours
* commit '
2ed7b6d82a921f085ee22914ecb0a09456ac44ed':
Revert "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 11 Jan 2016 14:24:19 +0000 (14:24 +0000)]
Revert "Import translations. DO NOT MERGE"
This reverts commit
9f9e736e0dc08f7fd84d3b557ee4ae8212c61be4.
Change-Id: I7164f13dedd0713b948b4f6bcf4b54aa0bdcc0c8
Geoff Mendal [Mon, 11 Jan 2016 14:22:02 +0000 (14:22 +0000)]
Revert "Import translations. DO NOT MERGE" am:
9e5fe1a7da -s ours am:
1c51eb41ee -s ours
am:
eab7785333 -s ours
* commit '
eab778533331bc25b3b201ebb9519a016a451ae4':
Revert "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 11 Jan 2016 14:16:41 +0000 (14:16 +0000)]
Import translations. DO NOT MERGE am:
9f9e736e0d -s ours am:
b441c6926b -s ours am:
83bf32ebe5 -s ours am:
42692affe2 -s ours
am:
8ea585955c -s ours
* commit '
8ea585955c8aa06daa87a6690421f73f98bb036e':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 11 Jan 2016 14:16:40 +0000 (14:16 +0000)]
Revert "Import translations. DO NOT MERGE" am:
9e5fe1a7da -s ours
am:
1c51eb41ee -s ours
* commit '
1c51eb41ee57bb2aeff62dd23576c6565a86de17':
Revert "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 11 Jan 2016 14:11:44 +0000 (14:11 +0000)]
Import translations. DO NOT MERGE am:
9f9e736e0d -s ours am:
b441c6926b -s ours am:
83bf32ebe5 -s ours
am:
42692affe2 -s ours
* commit '
42692affe23352b7e0bbcc9ef4d6f5fb661cc943':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 11 Jan 2016 14:11:44 +0000 (14:11 +0000)]
Revert "Import translations. DO NOT MERGE"
am:
9e5fe1a7da -s ours
* commit '
9e5fe1a7da02055c03b434db04f0927ba174f3f9':
Revert "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 11 Jan 2016 14:05:05 +0000 (14:05 +0000)]
Import translations. DO NOT MERGE am:
9f9e736e0d -s ours am:
b441c6926b -s ours
am:
83bf32ebe5 -s ours
* commit '
83bf32ebe589fa2ed4c8501eb6b0def97e2dd9ac':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 11 Jan 2016 14:04:51 +0000 (14:04 +0000)]
Revert "Import translations. DO NOT MERGE"
This reverts commit
f7e5202668cd2b0dc26a65e46b68a4267567bce0.
Change-Id: Ia54e4b766ea2a9f9815baef29df546605d1c3672
Geoff Mendal [Mon, 11 Jan 2016 13:59:58 +0000 (13:59 +0000)]
Import translations. DO NOT MERGE am:
9f9e736e0d -s ours
am:
b441c6926b -s ours
* commit '
b441c6926bbc977956cd1cb6afcc338b09e5d6e3':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 11 Jan 2016 13:59:57 +0000 (13:59 +0000)]
Import translations. DO NOT MERGE am:
a4505e9264 -s ours am:
bc3b9e2a83 -s ours am:
a6a761d9fd -s ours
am:
a8ae80950e -s ours
* commit '
a8ae80950eae564cae9b8bf3b8146eede57317c7':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 11 Jan 2016 13:57:31 +0000 (13:57 +0000)]
Import translations. DO NOT MERGE am:
f7e5202668 -s ours am:
0b1a880876 -s ours am:
f272b0a87e -s ours
am:
0c6bf20b04 -s ours
* commit '
0c6bf20b04b8eb3c3b66d563ed497491ddb511c5':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 11 Jan 2016 13:54:49 +0000 (13:54 +0000)]
Import translations. DO NOT MERGE
am:
9f9e736e0d -s ours
* commit '
9f9e736e0dc08f7fd84d3b557ee4ae8212c61be4':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 11 Jan 2016 13:54:46 +0000 (13:54 +0000)]
Import translations. DO NOT MERGE am:
a4505e9264 -s ours am:
bc3b9e2a83 -s ours
am:
a6a761d9fd -s ours
* commit '
a6a761d9fdbcae6c62fc50f0a36c64c57c8c7403':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 11 Jan 2016 13:52:00 +0000 (13:52 +0000)]
Import translations. DO NOT MERGE am:
f7e5202668 -s ours am:
0b1a880876 -s ours
am:
f272b0a87e -s ours
* commit '
f272b0a87ed5af0317285ef047cf95cd4601ebca':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 11 Jan 2016 13:49:05 +0000 (13:49 +0000)]
Import translations. DO NOT MERGE am:
a4505e9264 -s ours
am:
bc3b9e2a83 -s ours
* commit '
bc3b9e2a83909cb170de2d48023db2d67388162f':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 11 Jan 2016 13:46:48 +0000 (08:46 -0500)]
Import translations. DO NOT MERGE
Change-Id: I96e1041e8b74246336e2178ad73cb4d61ad41e37
Auto-generated-cl: translation import
Geoff Mendal [Mon, 11 Jan 2016 13:46:15 +0000 (13:46 +0000)]
Import translations. DO NOT MERGE am:
f7e5202668 -s ours
am:
0b1a880876 -s ours
* commit '
0b1a88087604f1f94d616934947a530c8ea40f0f':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 11 Jan 2016 13:43:25 +0000 (13:43 +0000)]
Import translations. DO NOT MERGE
am:
a4505e9264 -s ours
* commit '
a4505e926410cbf20dcd301f35f3496628cad9de':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 11 Jan 2016 13:40:07 +0000 (13:40 +0000)]
Import translations. DO NOT MERGE
am:
f7e5202668 -s ours
* commit '
f7e5202668cd2b0dc26a65e46b68a4267567bce0':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 11 Jan 2016 13:34:53 +0000 (08:34 -0500)]
Import translations. DO NOT MERGE
Change-Id: I3480788044f57b8097e54c28cb7984024719b8ca
Auto-generated-cl: translation import
Geoff Mendal [Mon, 11 Jan 2016 13:22:53 +0000 (08:22 -0500)]
Import translations. DO NOT MERGE
Change-Id: I2591758894a20c8459e7161ab6d97ac3a9a32654
Auto-generated-cl: translation import
Daniel Sandler [Thu, 7 Jan 2016 18:09:29 +0000 (18:09 +0000)]
Merge "DO NOT MERGE: Use GregorianCalendar.add() when searching for next alarm." into mnc-dr1.5-dev
Dan Sandler [Tue, 29 Dec 2015 20:45:39 +0000 (15:45 -0500)]
DO NOT MERGE: Use GregorianCalendar.add() when searching for next alarm.
Never attribute to malice that which is adequately explained
by a bug, particularly one involving date math.
Bug:
26326394
Change-Id: I3483ac102c678a8852565c8ea94c06e19b3f26d8
Baligh Uddin [Thu, 7 Jan 2016 16:43:22 +0000 (16:43 +0000)]
Fix plurals variable to unblock Translations Pipeline. am:
61f9f31468 am:
4340e0677b am:
aa2210c5c1 am:
78f672ef05 am:
8d85292827 am:
212fe88251
am:
ee895112b3
* commit '
ee895112b3b221062c7093582c9ad98b3bf0bf58':
Fix plurals variable to unblock Translations Pipeline.
Baligh Uddin [Thu, 7 Jan 2016 16:39:15 +0000 (16:39 +0000)]
Fix plurals variable to unblock Translations Pipeline. am:
61f9f31468 am:
4340e0677b am:
aa2210c5c1 am:
78f672ef05 am:
8d85292827
am:
212fe88251
* commit '
212fe88251a6c769ba71f562fd2f51c30926ccc1':
Fix plurals variable to unblock Translations Pipeline.
Baligh Uddin [Thu, 7 Jan 2016 16:35:00 +0000 (16:35 +0000)]
Fix plurals variable to unblock Translations Pipeline. am:
61f9f31468 am:
4340e0677b am:
aa2210c5c1 am:
78f672ef05
am:
8d85292827
* commit '
8d8529282719f035d0ce7460ffd640f94d6c6eb8':
Fix plurals variable to unblock Translations Pipeline.
Baligh Uddin [Thu, 7 Jan 2016 16:31:02 +0000 (16:31 +0000)]
Fix plurals variable to unblock Translations Pipeline. am:
61f9f31468 am:
4340e0677b am:
aa2210c5c1
am:
78f672ef05
* commit '
78f672ef05d9dbfbd0abf1b29b76f8cb22d84979':
Fix plurals variable to unblock Translations Pipeline.
Baligh Uddin [Thu, 7 Jan 2016 16:31:01 +0000 (16:31 +0000)]
Fix plurals variable to unblock Translations Pipeline. am:
71921cb23c am:
6980f76931
am:
a9850abb82
* commit '
a9850abb82b0ce7b4319a9b8deb0926f40ab1e70':
Fix plurals variable to unblock Translations Pipeline.
Baligh Uddin [Thu, 7 Jan 2016 16:26:49 +0000 (16:26 +0000)]
Fix plurals variable to unblock Translations Pipeline. am:
61f9f31468 am:
4340e0677b
am:
aa2210c5c1
* commit '
aa2210c5c174fd681fd52fd43e55de6c018a93ad':
Fix plurals variable to unblock Translations Pipeline.
Baligh Uddin [Thu, 7 Jan 2016 16:26:48 +0000 (16:26 +0000)]
Fix plurals variable to unblock Translations Pipeline. am:
71921cb23c
am:
6980f76931
* commit '
6980f76931d3a52a2c071b10a5736afe8de0fdf4':
Fix plurals variable to unblock Translations Pipeline.
Baligh Uddin [Thu, 7 Jan 2016 16:22:23 +0000 (16:22 +0000)]
Fix plurals variable to unblock Translations Pipeline. am:
61f9f31468
am:
4340e0677b
* commit '
4340e0677b691f2ab12549556c23b88e599cf8c1':
Fix plurals variable to unblock Translations Pipeline.
Baligh Uddin [Thu, 7 Jan 2016 16:18:11 +0000 (16:18 +0000)]
Fix plurals variable to unblock Translations Pipeline.
am:
61f9f31468
* commit '
61f9f31468c5fc4dd2605c9ab8cb6a54cc58d6f9':
Fix plurals variable to unblock Translations Pipeline.
Baligh Uddin [Thu, 7 Jan 2016 16:18:10 +0000 (16:18 +0000)]
Fix plurals variable to unblock Translations Pipeline.
am:
71921cb23c
* commit '
71921cb23c7493ae6c7186d5554233540c9bcc9c':
Fix plurals variable to unblock Translations Pipeline.
Baligh Uddin [Fri, 30 Jan 2015 15:09:16 +0000 (07:09 -0800)]
Fix plurals variable to unblock Translations Pipeline.
Bug:
19067882
(cherry picked from commit
50d23adfe26bf0cf9a34138efc299eaec04127e9)
Change-Id: I86022d6edab73dc4d11269783900710dc07a5b49
Baligh Uddin [Fri, 30 Jan 2015 15:09:16 +0000 (07:09 -0800)]
Fix plurals variable to unblock Translations Pipeline.
Bug:
19067882
(cherry picked from commit
50d23adfe26bf0cf9a34138efc299eaec04127e9)
Change-Id: I86022d6edab73dc4d11269783900710dc07a5b49
Jeremy Joslin [Fri, 18 Dec 2015 01:38:04 +0000 (17:38 -0800)]
Exit getAllValidScorers early if not the primary.
This fixes the crash that occurs when getAllValidScorers() is invoked by
a non-primary user when a scorer is active.
BUG:
23040221
Change-Id: I42c9e18d74389be3191258ca5626f2c433ca7cc7
Gus Prevas [Tue, 29 Dec 2015 15:12:10 +0000 (07:12 -0800)]
Merge "Defines task to front/back animations in styles_micro." into cw-e-dev
am:
1d3bac82b3
* commit '
1d3bac82b3bc59fd7225a3c27b32db2fc90b0308':
Defines task to front/back animations in styles_micro.
Gus Prevas [Tue, 29 Dec 2015 15:09:26 +0000 (15:09 +0000)]
Merge "Defines task to front/back animations in styles_micro." into cw-e-dev
Gus Prevas [Mon, 28 Dec 2015 20:02:13 +0000 (15:02 -0500)]
Defines task to front/back animations in styles_micro.
Bug:
26112737
Change-Id: I9f8c1da21580d525c32a76f25e223dc24d012837
Martijn Coenen [Wed, 23 Dec 2015 08:22:21 +0000 (08:22 +0000)]
Merge "Clear calling identify b4 Beam callback." into mnc-dr1.5-dev
Geoff Mendal [Mon, 21 Dec 2015 14:50:08 +0000 (06:50 -0800)]
Import translations. DO NOT MERGE
Change-Id: If00b01a244af6221a01d0c060c58da7389fd1b35
Auto-generated-cl: translation import
Martijn Coenen [Mon, 21 Dec 2015 10:29:45 +0000 (11:29 +0100)]
Clear calling identify b4 Beam callback.
Fixes AppOps crash, because it notices the calling
package is different from the calling UID.
Bug:
25492633
Change-Id: I55e2d975fd0a7ee94c4623efb3b19b1b54b72da2
Bryce Lee [Fri, 18 Dec 2015 23:07:49 +0000 (23:07 +0000)]
Merge "Remove duplicate Bluetooth profiles." into cw-e-dev
am:
9c27969385
* commit '
9c27969385d7a59a535ba3274c279ae96a155d49':
Remove duplicate Bluetooth profiles.
Bryce Lee [Fri, 18 Dec 2015 23:02:40 +0000 (23:02 +0000)]
Merge "Remove duplicate Bluetooth profiles." into cw-e-dev
Daniel Koulomzin [Fri, 18 Dec 2015 19:55:52 +0000 (11:55 -0800)]
Merge "Making ViewRootImpl drop input events when the Activity is in ambient mode." into cw-e-dev
am:
cbef517d02
* commit '
cbef517d02f4f3680e155cc1a704ebf5c959d03f':
Making ViewRootImpl drop input events when the Activity is in ambient mode.
Daniel Koulomzin [Fri, 18 Dec 2015 19:49:18 +0000 (19:49 +0000)]
Merge "Making ViewRootImpl drop input events when the Activity is in ambient mode." into cw-e-dev
Robert Greenwalt [Fri, 18 Dec 2015 19:36:54 +0000 (19:36 +0000)]
resolve merge conflicts of
9887f2f50a to lmp-sprout-dev. am:
5a77651489 am:
5946a9b798 am:
2ecc918bd3 am:
81674b1ff5 am:
1e04dfb926 am:
3927089cce
am:
f1530bf3d7
* commit '
f1530bf3d72315256dd7a2c18ba383dc15445b54':
Protect some new broadcasts.
Bryce Lee [Fri, 18 Dec 2015 19:34:20 +0000 (11:34 -0800)]
Remove duplicate Bluetooth profiles.
Change-Id: I04fd867511713dd02ef249b113f7a46c69f22f98
Robert Greenwalt [Fri, 18 Dec 2015 19:31:54 +0000 (11:31 -0800)]
resolve merge conflicts of
9887f2f50a to lmp-sprout-dev. am:
5a77651489 am:
5946a9b798 am:
2ecc918bd3 am:
81674b1ff5 am:
1e04dfb926
am:
3927089cce
* commit '
3927089cce9d43a0b517f53fd6a542f07cb0955b':
Protect some new broadcasts.
Robert Greenwalt [Fri, 18 Dec 2015 19:24:53 +0000 (11:24 -0800)]
resolve merge conflicts of
9887f2f50a to lmp-sprout-dev. am:
5a77651489 am:
5946a9b798 am:
2ecc918bd3 am:
81674b1ff5
am:
1e04dfb926
* commit '
1e04dfb926040a6fad073fca0835777123d155e7':
Protect some new broadcasts.
Robert Greenwalt [Fri, 18 Dec 2015 19:17:58 +0000 (19:17 +0000)]
resolve merge conflicts of
9887f2f50a to lmp-sprout-dev. am:
5a77651489 am:
5946a9b798 am:
2ecc918bd3
am:
81674b1ff5
* commit '
81674b1ff5deedcf2f1a79f07441e506a4f66354':
Protect some new broadcasts.
Robert Greenwalt [Fri, 18 Dec 2015 19:04:25 +0000 (19:04 +0000)]
resolve merge conflicts of
9887f2f50a to lmp-sprout-dev. am:
5a77651489 am:
5946a9b798
am:
2ecc918bd3
* commit '
2ecc918bd3c7f63ea70a7395b3a622c7f1a40f84':
Protect some new broadcasts.
Robert Greenwalt [Fri, 18 Dec 2015 18:48:59 +0000 (18:48 +0000)]
resolve merge conflicts of
9887f2f50a to lmp-sprout-dev. am:
5a77651489
am:
5946a9b798
* commit '
5946a9b798f9a4b0e9eacd2685fc5ec9d6cc9ed6':
Protect some new broadcasts.
Robert Greenwalt [Fri, 18 Dec 2015 18:38:10 +0000 (18:38 +0000)]
resolve merge conflicts of
9887f2f50a to lmp-sprout-dev.
am:
5a77651489
* commit '
5a77651489ace080671034a85e5771c6ddc73525':
Protect some new broadcasts.
Daniel Koulomzin [Wed, 16 Dec 2015 22:52:25 +0000 (17:52 -0500)]
Making ViewRootImpl drop input events when the Activity is in ambient
mode.
WearableActivityController tells ViewRootImpl about ambient mode.
Bug:
25912259
Bug:
25973146
Bug:
25714113
Change-Id: Idcca2b254db3145039f50f2a7dfd38a224ec287e
Robert Greenwalt [Fri, 18 Dec 2015 03:32:43 +0000 (19:32 -0800)]
resolve merge conflicts of
9887f2f50a to lmp-sprout-dev.
Change-Id: I240cac5cba106a7f0fab61e04af2c757b46b0bb0
Mark Lu [Fri, 6 Nov 2015 07:26:15 +0000 (15:26 +0800)]
Fix system watchdog timeout when reading too many usage events.
Symptom:
As issue link:
https://code.google.com/p/android/issues/detail?id=193100
RootCause:
UsageStatsService.onDisplayChanged executed in system main thread,
If calling UsageStatsManager.queryEvents with too many events before it
(i.e. in daily usage event file,
too many activity resume / pause events or configuration change
during monkey test),
System will be blocked then watchdog timeout.
Solution:
Let display listener executed in background thread handler
BUG:
25355086
Change-Id: Ic894d112612400ed8fb7ba843b3309fdc4f66fe1
(Cherrypicked from
4e59db328d8b0cc163d2e3eb0f7f3a108f20a58d)
(cherry picked from commit
7018f60b06fd0c647ebf13225320d7e15d02e075)
Robert Greenwalt [Thu, 17 Dec 2015 23:09:11 +0000 (23:09 +0000)]
Merge "Check permissions on getDeviceId." into mnc-dev am:
4557ef32fe am:
628b8f1f5f
am:
a652b7161d
* commit '
a652b7161d3069ba9b5650f1caf741d2588de141':
Check permissions on getDeviceId.
Robert Greenwalt [Thu, 17 Dec 2015 23:07:22 +0000 (23:07 +0000)]
Merge "Check permissions on getDeviceId." into mnc-dr-dev am:
ef58df63d6
am:
064eb2a7cc
* commit '
064eb2a7cc8b811671682018b82c2b63064971ef':
Check permissions on getDeviceId.
Robert Greenwalt [Thu, 17 Dec 2015 23:04:24 +0000 (23:04 +0000)]
Merge "Check permissions on getDeviceId." into mnc-dev am:
4557ef32fe
am:
628b8f1f5f
* commit '
628b8f1f5f6d249e2f222602352d14c40d648d97':
Check permissions on getDeviceId.
Robert Greenwalt [Thu, 17 Dec 2015 23:01:33 +0000 (23:01 +0000)]
Merge "Check permissions on getDeviceId." into mnc-dr-dev
am:
ef58df63d6
* commit '
ef58df63d6ba9d56620b6a440f15d0e07c842a44':
Check permissions on getDeviceId.
Robert Greenwalt [Thu, 17 Dec 2015 22:58:14 +0000 (22:58 +0000)]
Merge "Check permissions on getDeviceId." into mnc-dev
am:
4557ef32fe
* commit '
4557ef32fe36b6f7ef7918052400d18af51d452f':
Check permissions on getDeviceId.
Robert Greenwalt [Thu, 17 Dec 2015 22:52:58 +0000 (22:52 +0000)]
Merge "Check permissions on getDeviceId." into mnc-dr-dev
Robert Greenwalt [Thu, 17 Dec 2015 22:52:56 +0000 (22:52 +0000)]
Merge "Check permissions on getDeviceId." into mnc-dev
Bryce Lee [Thu, 17 Dec 2015 19:45:17 +0000 (11:45 -0800)]
Merge "Add setting for declaring disabled bluetooth profiles." into cw-e-dev
am:
cf91b45c05
* commit '
cf91b45c05358c81ddaccf3ddd4b1ea6d5295faa':
Add setting for declaring disabled bluetooth profiles.
Bryce Lee [Thu, 17 Dec 2015 19:40:47 +0000 (19:40 +0000)]
Merge "Add setting for declaring disabled bluetooth profiles." into cw-e-dev
Bryce Lee [Thu, 17 Dec 2015 00:09:56 +0000 (00:09 +0000)]
Merge "Add UUID to BluetoothHeadsetClientCall" into cw-e-dev
am:
cae2f2415b
* commit '
cae2f2415ba04eb854fdcdc6aa66c857ad7148d0':
Add UUID to BluetoothHeadsetClientCall
Bryce Lee [Thu, 17 Dec 2015 00:02:41 +0000 (00:02 +0000)]
Merge "Add UUID to BluetoothHeadsetClientCall" into cw-e-dev
Bryce Lee [Wed, 16 Dec 2015 23:33:59 +0000 (15:33 -0800)]
Add UUID to BluetoothHeadsetClientCall
This will allow for unique identification of a call as id only provides
uniqueness per session.
Bug:
26016489
Change-Id: I643d24bf5ff5680c26e530075649ef2a4f378295
Adam Lesinski [Wed, 16 Dec 2015 23:25:45 +0000 (23:25 +0000)]
DO NOT MERGE: AAPT: Dump uses-permission-sdk-23 am:
b2c5155638 am:
40d1ab91d2
am:
8c9209183f
* commit '
8c9209183fa67953bebe1adb5dfb529c1b6273f0':
DO NOT MERGE: AAPT: Dump uses-permission-sdk-23
Adam Lesinski [Wed, 16 Dec 2015 23:16:18 +0000 (23:16 +0000)]
DO NOT MERGE: AAPT: Dump uses-permission-sdk-23 am:
b2c5155638
am:
40d1ab91d2
* commit '
40d1ab91d2a0ed1f066b6a8de821c9c4c70ca512':
DO NOT MERGE: AAPT: Dump uses-permission-sdk-23
Adam Lesinski [Wed, 16 Dec 2015 23:09:27 +0000 (23:09 +0000)]
DO NOT MERGE: AAPT: Dump uses-permission-sdk-23
am:
b2c5155638
* commit '
b2c51556382acd3981e5a6380e2fb3d85c2f68a5':
DO NOT MERGE: AAPT: Dump uses-permission-sdk-23
Adam Lesinski [Wed, 2 Dec 2015 23:40:19 +0000 (15:40 -0800)]
DO NOT MERGE: AAPT: Dump uses-permission-sdk-23
Include <uses-permission-sdk-23> permissions in dump badging and dump permissions.
This will also add implied features for that permission, marked as -sdk-23 features.
Ex:
uses-permission: name='android.permission.ACCESS_FINE_LOCATION'
uses-permission-sdk-23: name='android.permission.CAMERA'
feature-group: label=''
uses-feature: name='android.hardware.location'
uses-implied-feature: name='android.hardware.location' reason='...'
uses-feature-sdk-23: name='android.hardware.camera'
uses-implied-feature-sdk-23: name='android.hardware.camera' reason='...'
Bug:
24939655
Change-Id: Ifb374696ed4760b0ba2f1cc3516f3bf08e6cb6a3
(cherry picked from commit
5f3b2ecb3e9d27e77bd59c7b9006a6239b773944)
Bryce Lee [Wed, 16 Dec 2015 21:32:28 +0000 (13:32 -0800)]
Add setting for declaring disabled bluetooth profiles.
Bug:
25900899
Change-Id: I420a7c590d72ba10f3e466d15dccfdbb520e810a
Geoff Mendal [Wed, 16 Dec 2015 05:11:07 +0000 (05:11 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
am:
d0dd157ade -s ours
* commit '
d0dd157ade7536286e32ecbb271d3561bd7b5e93':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 16 Dec 2015 05:09:37 +0000 (05:09 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
am:
8b4b230174 -s ours
* commit '
8b4b230174228fd6313ae493a44cc7dc67c6bfc4':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 16 Dec 2015 05:05:18 +0000 (05:05 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
Geoff Mendal [Wed, 16 Dec 2015 05:03:50 +0000 (21:03 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ia8ab8097f7b82ed5fb344351035535c5b3b0690d
Auto-generated-cl: translation import
Geoff Mendal [Wed, 16 Dec 2015 05:02:26 +0000 (05:02 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
Geoff Mendal [Wed, 16 Dec 2015 05:00:49 +0000 (21:00 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ifbe7e97f2a1fe1b688642a8179c0e184d69ba3cb
Auto-generated-cl: translation import
OSDN Git Service
