drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
206,444 Commits 1 Branch 0 Tags
Commit Graph

206444 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
009fb756ec Revert "Import translations. DO NOT MERGE" am: 8874f9754f -s ours 
am: 4df8f4abe0  -s ours

* commit '4df8f4abe076d870b0e406efcd9c2d7cb6e4c81f':
  Revert "Import translations. DO NOT MERGE"
 2016-01-11 14:32:35 +00:00
Geoff Mendal
4df8f4abe0 Revert "Import translations. DO NOT MERGE" 
am: 8874f9754f  -s ours

* commit '8874f9754f909dafcc2c5c23109e35297263f469':
  Revert "Import translations. DO NOT MERGE"
 2016-01-11 14:28:57 +00:00
Geoff Mendal
d344dc256b 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"
 2016-01-11 14:28:55 +00:00
Geoff Mendal
8874f9754f Revert "Import translations. DO NOT MERGE" 
This reverts commit 9f9e736e0dc08f7fd84d3b557ee4ae8212c61be4.

Change-Id: I7164f13dedd0713b948b4f6bcf4b54aa0bdcc0c8
 2016-01-11 14:24:19 +00:00
Geoff Mendal
2ed7b6d82a 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"
 2016-01-11 14:22:02 +00:00
Geoff Mendal
4ae777097e 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
 2016-01-11 14:16:41 +00:00
Geoff Mendal
eab7785333 Revert "Import translations. DO NOT MERGE" am: 9e5fe1a7da -s ours 
am: 1c51eb41ee  -s ours

* commit '1c51eb41ee57bb2aeff62dd23576c6565a86de17':
  Revert "Import translations. DO NOT MERGE"
 2016-01-11 14:16:40 +00:00
Geoff Mendal
8ea585955c 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
 2016-01-11 14:11:44 +00:00
Geoff Mendal
1c51eb41ee Revert "Import translations. DO NOT MERGE" 
am: 9e5fe1a7da  -s ours

* commit '9e5fe1a7da02055c03b434db04f0927ba174f3f9':
  Revert "Import translations. DO NOT MERGE"
 2016-01-11 14:11:44 +00:00
Geoff Mendal
42692affe2 Import translations. DO NOT MERGE am: 9f9e736e0d -s ours am: b441c6926b -s ours 
am: 83bf32ebe5  -s ours

* commit '83bf32ebe589fa2ed4c8501eb6b0def97e2dd9ac':
  Import translations. DO NOT MERGE
 2016-01-11 14:05:05 +00:00
Geoff Mendal
9e5fe1a7da Revert "Import translations. DO NOT MERGE" 
This reverts commit f7e5202668cd2b0dc26a65e46b68a4267567bce0.

Change-Id: Ia54e4b766ea2a9f9815baef29df546605d1c3672
 2016-01-11 14:04:51 +00:00
Geoff Mendal
83bf32ebe5 Import translations. DO NOT MERGE am: 9f9e736e0d -s ours 
am: b441c6926b  -s ours

* commit 'b441c6926bbc977956cd1cb6afcc338b09e5d6e3':
  Import translations. DO NOT MERGE
 2016-01-11 13:59:58 +00:00
Geoff Mendal
82666a9f2a 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
 2016-01-11 13:59:57 +00:00
Geoff Mendal
62e77bd206 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
 2016-01-11 13:57:31 +00:00
Geoff Mendal
b441c6926b Import translations. DO NOT MERGE 
am: 9f9e736e0d  -s ours

* commit '9f9e736e0dc08f7fd84d3b557ee4ae8212c61be4':
  Import translations. DO NOT MERGE
 2016-01-11 13:54:49 +00:00
Geoff Mendal
a8ae80950e Import translations. DO NOT MERGE am: a4505e9264 -s ours am: bc3b9e2a83 -s ours 
am: a6a761d9fd  -s ours

* commit 'a6a761d9fdbcae6c62fc50f0a36c64c57c8c7403':
  Import translations. DO NOT MERGE
 2016-01-11 13:54:46 +00:00
Geoff Mendal
0c6bf20b04 Import translations. DO NOT MERGE am: f7e5202668 -s ours am: 0b1a880876 -s ours 
am: f272b0a87e  -s ours

* commit 'f272b0a87ed5af0317285ef047cf95cd4601ebca':
  Import translations. DO NOT MERGE
 2016-01-11 13:52:00 +00:00
Geoff Mendal
a6a761d9fd Import translations. DO NOT MERGE am: a4505e9264 -s ours 
am: bc3b9e2a83  -s ours

* commit 'bc3b9e2a83909cb170de2d48023db2d67388162f':
  Import translations. DO NOT MERGE
 2016-01-11 13:49:05 +00:00
Geoff Mendal
9f9e736e0d Import translations. DO NOT MERGE 
Change-Id: I96e1041e8b74246336e2178ad73cb4d61ad41e37
Auto-generated-cl: translation import
 2016-01-11 08:46:48 -05:00
Geoff Mendal
f272b0a87e Import translations. DO NOT MERGE am: f7e5202668 -s ours 
am: 0b1a880876  -s ours

* commit '0b1a88087604f1f94d616934947a530c8ea40f0f':
  Import translations. DO NOT MERGE
 2016-01-11 13:46:15 +00:00
Geoff Mendal
bc3b9e2a83 Import translations. DO NOT MERGE 
am: a4505e9264  -s ours

* commit 'a4505e926410cbf20dcd301f35f3496628cad9de':
  Import translations. DO NOT MERGE
 2016-01-11 13:43:25 +00:00
Geoff Mendal
0b1a880876 Import translations. DO NOT MERGE 
am: f7e5202668  -s ours

* commit 'f7e5202668cd2b0dc26a65e46b68a4267567bce0':
  Import translations. DO NOT MERGE
 2016-01-11 13:40:07 +00:00
Geoff Mendal
a4505e9264 Import translations. DO NOT MERGE 
Change-Id: I3480788044f57b8097e54c28cb7984024719b8ca
Auto-generated-cl: translation import
 2016-01-11 08:34:53 -05:00
Geoff Mendal
f7e5202668 Import translations. DO NOT MERGE 
Change-Id: I2591758894a20c8459e7161ab6d97ac3a9a32654
Auto-generated-cl: translation import
 2016-01-11 08:22:53 -05:00
Adam Lesinski
da4a377573 UsageStatsService: Fix app idle issue at rollover time 
App Idle queries are very frequent and so they only check in memory stats.
However, in memory stats can be missing some entries, especially after a rollover, but also
due to a larger bug fixed in master (too risky to take now).

The fix is to do a deep query (reading older files from disk) and maintain a parallel cache
of stats for app idle. That way the rolling window of data required to serve app idle queries
stays in memory.

Bug:26355386
Change-Id: I2dd3946b45d7d893410715bb0534b2b48694ced6
 2016-01-09 05:58:52 +00:00
Daniel Sandler
c2ec3f1bbe Merge "DO NOT MERGE: Use GregorianCalendar.add() when searching for next alarm." into mnc-dr1.5-dev 2016-01-07 18:09:29 +00:00
Dan Sandler
8d9aea8a18 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
 2016-01-07 18:09:11 +00:00
Baligh Uddin
9530b07c4e 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.
 2016-01-07 16:43:22 +00:00
Baligh Uddin
ee895112b3 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.
 2016-01-07 16:39:15 +00:00
Baligh Uddin
212fe88251 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.
 2016-01-07 16:35:00 +00:00
Baligh Uddin
8d85292827 Fix plurals variable to unblock Translations Pipeline. am: 61f9f31468 am: 4340e0677b am: aa2210c5c1 
am: 78f672ef05

* commit '78f672ef05d9dbfbd0abf1b29b76f8cb22d84979':
  Fix plurals variable to unblock Translations Pipeline.
 2016-01-07 16:31:02 +00:00
Baligh Uddin
9c43094473 Fix plurals variable to unblock Translations Pipeline. am: 71921cb23c am: 6980f76931 
am: a9850abb82

* commit 'a9850abb82b0ce7b4319a9b8deb0926f40ab1e70':
  Fix plurals variable to unblock Translations Pipeline.
 2016-01-07 16:31:01 +00:00
Baligh Uddin
78f672ef05 Fix plurals variable to unblock Translations Pipeline. am: 61f9f31468 am: 4340e0677b 
am: aa2210c5c1

* commit 'aa2210c5c174fd681fd52fd43e55de6c018a93ad':
  Fix plurals variable to unblock Translations Pipeline.
 2016-01-07 16:26:49 +00:00
Baligh Uddin
a9850abb82 Fix plurals variable to unblock Translations Pipeline. am: 71921cb23c 
am: 6980f76931

* commit '6980f76931d3a52a2c071b10a5736afe8de0fdf4':
  Fix plurals variable to unblock Translations Pipeline.
 2016-01-07 16:26:48 +00:00
Baligh Uddin
aa2210c5c1 Fix plurals variable to unblock Translations Pipeline. am: 61f9f31468 
am: 4340e0677b

* commit '4340e0677b691f2ab12549556c23b88e599cf8c1':
  Fix plurals variable to unblock Translations Pipeline.
 2016-01-07 16:22:23 +00:00
Baligh Uddin
4340e0677b Fix plurals variable to unblock Translations Pipeline. 
am: 61f9f31468

* commit '61f9f31468c5fc4dd2605c9ab8cb6a54cc58d6f9':
  Fix plurals variable to unblock Translations Pipeline.
 2016-01-07 16:18:11 +00:00
Baligh Uddin
6980f76931 Fix plurals variable to unblock Translations Pipeline. 
am: 71921cb23c

* commit '71921cb23c7493ae6c7186d5554233540c9bcc9c':
  Fix plurals variable to unblock Translations Pipeline.
 2016-01-07 16:18:10 +00:00
Baligh Uddin
71921cb23c Fix plurals variable to unblock Translations Pipeline. 
Bug: 19067882
(cherry picked from commit 50d23adfe26bf0cf9a34138efc299eaec04127e9)

Change-Id: I86022d6edab73dc4d11269783900710dc07a5b49
 2016-01-06 18:55:26 +00:00
Baligh Uddin
61f9f31468 Fix plurals variable to unblock Translations Pipeline. 
Bug: 19067882
(cherry picked from commit 50d23adfe26bf0cf9a34138efc299eaec04127e9)

Change-Id: I86022d6edab73dc4d11269783900710dc07a5b49
 2016-01-06 18:54:41 +00:00
Jeremy Joslin
5b294b45d0 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
 2016-01-05 17:44:05 -08:00
Gus Prevas
b805bb8b66 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.
 2015-12-29 07:12:10 -08:00
Gus Prevas
1d3bac82b3 Merge "Defines task to front/back animations in styles_micro." into cw-e-dev 2015-12-29 15:09:26 +00:00
Gus Prevas
fcc57db731 Defines task to front/back animations in styles_micro. 
Bug: 26112737
Change-Id: I9f8c1da21580d525c32a76f25e223dc24d012837
 2015-12-28 15:02:13 -05:00
Martijn Coenen
4bbd3c4819 Merge "Clear calling identify b4 Beam callback." into mnc-dr1.5-dev 2015-12-23 08:22:21 +00:00
Geoff Mendal
fd87e92a42 Import translations. DO NOT MERGE 
Change-Id: If00b01a244af6221a01d0c060c58da7389fd1b35
Auto-generated-cl: translation import
 2015-12-21 06:50:08 -08:00
Martijn Coenen
24584f0b34 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
 2015-12-21 10:33:06 +00:00
Bryce Lee
d980b8c7a0 Merge "Remove duplicate Bluetooth profiles." into cw-e-dev 
am: 9c27969385

* commit '9c27969385d7a59a535ba3274c279ae96a155d49':
  Remove duplicate Bluetooth profiles.
 2015-12-18 23:07:49 +00:00
Bryce Lee
9c27969385 Merge "Remove duplicate Bluetooth profiles." into cw-e-dev 2015-12-18 23:02:40 +00:00
Daniel Koulomzin
898e330aae 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.
 2015-12-18 11:55:52 -08:00
Daniel Koulomzin
cbef517d02 Merge "Making ViewRootImpl drop input events when the Activity is in ambient mode." into cw-e-dev 2015-12-18 19:49:18 +00:00