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

23687 Commits

Author SHA1 Message Date
Christopher Tate
0749755989 am f83fa5fe: am f9221a10: am 3bec5090: Merge "Properly recognize repeating wakeup alarms" into lmp-mr1-dev 
* commit 'f83fa5fee60f449db0591661471581b8ce128439':
  Properly recognize repeating wakeup alarms
 2014-12-03 00:31:52 +00:00
Christopher Tate
3fbb7900b9 am 953e90d0: am f246b484: am 99391361: Merge "Midnight should mean midnight" into lmp-mr1-dev 
* commit '953e90d0d77b050020fcdfae5b857108adb92102':
  Midnight should mean midnight
 2014-12-03 00:31:46 +00:00
Jinsuk Kim
7ef3d12832 am eb6c6d63: am 566d15f6: am fb020862: Merge "CEC: Set the parameter of <System Audio Mode Request> right" into lmp-mr1-dev 
* commit 'eb6c6d634774d85eceac135a91fdeaf3a884152e':
  CEC: Set the parameter of <System Audio Mode Request> right
 2014-12-03 00:30:08 +00:00
Nick Kralevich
2ae769782e resolved conflicts for merge of ef9b1643 to master 
Change-Id: Ifcde272f882e55998b16e02cca1e827dec35ce6f
 2014-12-02 16:22:57 -08:00
Christopher Tate
f83fa5fee6 am f9221a10: am 3bec5090: Merge "Properly recognize repeating wakeup alarms" into lmp-mr1-dev 
* commit 'f9221a1076203832d8d88a8720c12cad91aee906':
  Properly recognize repeating wakeup alarms
 2014-12-02 23:56:58 +00:00
Christopher Tate
953e90d0d7 am f246b484: am 99391361: Merge "Midnight should mean midnight" into lmp-mr1-dev 
* commit 'f246b484c5cf8b63e1b700d17e8161f566e3f5d7':
  Midnight should mean midnight
 2014-12-02 23:56:52 +00:00
Christopher Tate
f9221a1076 am 3bec5090: Merge "Properly recognize repeating wakeup alarms" into lmp-mr1-dev 
* commit '3bec50908b8438c04a654a3bb806f05a01402ce7':
  Properly recognize repeating wakeup alarms
 2014-12-02 23:48:31 +00:00
Christopher Tate
f246b484c5 am 99391361: Merge "Midnight should mean midnight" into lmp-mr1-dev 
* commit '99391361217cd9234ddc0570055677863cb6fb34':
  Midnight should mean midnight
 2014-12-02 23:48:26 +00:00
Christopher Tate
3bec50908b Merge "Properly recognize repeating wakeup alarms" into lmp-mr1-dev 2014-12-02 23:44:20 +00:00
Christopher Tate
9939136121 Merge "Midnight should mean midnight" into lmp-mr1-dev 2014-12-02 23:44:00 +00:00
Jinsuk Kim
eb6c6d6347 am 566d15f6: am fb020862: Merge "CEC: Set the parameter of <System Audio Mode Request> right" into lmp-mr1-dev 
* commit '566d15f653c2e2c8440090bb2cca1baaad658436':
  CEC: Set the parameter of <System Audio Mode Request> right
 2014-12-02 22:05:11 +00:00
Jinsuk Kim
566d15f653 am fb020862: Merge "CEC: Set the parameter of <System Audio Mode Request> right" into lmp-mr1-dev 
* commit 'fb020862e0d8740d31ead217fd4d308450b4170d':
  CEC: Set the parameter of <System Audio Mode Request> right
 2014-12-02 21:58:18 +00:00
Jinsuk Kim
fb020862e0 Merge "CEC: Set the parameter of <System Audio Mode Request> right" into lmp-mr1-dev 2014-12-02 21:50:44 +00:00
Paul Lawrence
ef9b16431e am 1056d5a9: am 75f304f9: Merge changes Ibfb5c6ab,I712919ae into lmp-mr1-dev 
* commit '1056d5a997e3f30230e1e4316310586dd15a4600':
  Add mechanism for securely returning parameters though NativeDaemonConnector
  Revert "DO NOT MERGE: Don't log passwords returned from vdc"
 2014-12-02 20:30:01 +00:00
Paul Lawrence
1056d5a997 am 75f304f9: Merge changes Ibfb5c6ab,I712919ae into lmp-mr1-dev 
* commit '75f304f922dcb27e57dcbea17a36d426f6b223a7':
  Add mechanism for securely returning parameters though NativeDaemonConnector
  Revert "DO NOT MERGE: Don't log passwords returned from vdc"
 2014-12-02 20:22:18 +00:00
Paul Lawrence
75f304f922 Merge changes Ibfb5c6ab,I712919ae into lmp-mr1-dev 
* changes:
  Add mechanism for securely returning parameters though NativeDaemonConnector
  Revert "DO NOT MERGE: Don't log passwords returned from vdc"
 2014-12-02 20:17:33 +00:00
Christopher Tate
864d42eb96 Properly recognize repeating wakeup alarms 
The code in place was inappropriately treating all recurring alarms
as non-wakeup for purposes of deferral.  Worse, it was overriding the
"this deliverable batch of alarms includes a wakeup alarm" bookkeeping,
so could potentially cause inappropriate deferral of even standalone
wakeup alarms.

Bug 18591317

Change-Id: I2a62ed4badcaeb549c1ac4f086014aa829e45427
 2014-12-02 11:48:53 -08:00
Craig Mautner
afcb1d6561 am 240602f4: am 877d8939: am f6be7d17: Merge "[ActivityManager] Fix race condition in pss collection" 
* commit '240602f43184b820ecff064d61e99017f849c0cf':
  [ActivityManager] Fix race condition in pss collection
 2014-12-02 19:35:02 +00:00
Christoph Studer
cf9727b928 am 4b1cbaaf: am cd9eb9be: am 27ef0188: Merge "NoMan/SysUI: Clear LEDs only when entering the shade" into lmp-mr1-dev 
* commit '4b1cbaaf4ec9f3f58a389496faacf77ee46fa2ed':
  NoMan/SysUI: Clear LEDs only when entering the shade
 2014-12-02 19:14:29 +00:00
Craig Mautner
240602f431 am 877d8939: am f6be7d17: Merge "[ActivityManager] Fix race condition in pss collection" 
* commit '877d89399af77a98dd940c034aa631029ed313cc':
  [ActivityManager] Fix race condition in pss collection
 2014-12-02 19:14:07 +00:00
Christoph Studer
4b1cbaaf4e am cd9eb9be: am 27ef0188: Merge "NoMan/SysUI: Clear LEDs only when entering the shade" into lmp-mr1-dev 
* commit 'cd9eb9bee788252cd6d6bcdb7fcdc5a5d0dcfe5c':
  NoMan/SysUI: Clear LEDs only when entering the shade
 2014-12-02 19:08:13 +00:00
Marvin Paul
baecfda4d5 am e67cf731: am 364a8fe9: am 5aeed158: Merge "Added explicit sort order when fetching accounts." into lmp-mr1-dev 
* commit 'e67cf73146cecce5be22264ca7c596b454ded08d':
  Added explicit sort order when fetching accounts.
 2014-12-02 19:05:25 +00:00
Christoph Studer
cd9eb9bee7 am 27ef0188: Merge "NoMan/SysUI: Clear LEDs only when entering the shade" into lmp-mr1-dev 
* commit '27ef018846fc88122bcb2c30ba86e99a5b3039d6':
  NoMan/SysUI: Clear LEDs only when entering the shade
 2014-12-02 18:59:26 +00:00
Craig Mautner
f6be7d177a Merge "[ActivityManager] Fix race condition in pss collection" 2014-12-02 18:57:36 +00:00
Christopher Tate
f6f8cca782 Midnight should mean midnight 
...not noon-or-midnight.  Fix the initial fstrim delay to properly refer
to midnight rather than ambiguous 12-hour "zero" so that fstrim job
consideration always starts overnight rather than possibly at the following
day's noon, depending on when the device was booted.

Bug 18076397

Change-Id: Ife3cd5bdeb14c7832b6e2a2de88dcfd1ba731b67
 2014-12-02 10:55:09 -08:00
Marvin Paul
e67cf73146 am 364a8fe9: am 5aeed158: Merge "Added explicit sort order when fetching accounts." into lmp-mr1-dev 
* commit '364a8fe9a250093f46581ece2792a3bc7cc06446':
  Added explicit sort order when fetching accounts.
 2014-12-02 18:54:29 +00:00
Junda Liu
b27dbd2151 am 92205a33: am 50e2d6c2: am ef6178a9: Merge "Add hasMatchedTetherApnSetting to telmgr API." into lmp-mr1-dev 
* commit '92205a33655f8a4f487e8d85a9d6d151d0db21a1':
  Add hasMatchedTetherApnSetting to telmgr API.
 2014-12-02 18:52:28 +00:00
Christoph Studer
27ef018846 Merge "NoMan/SysUI: Clear LEDs only when entering the shade" into lmp-mr1-dev 2014-12-02 18:49:51 +00:00
Marvin Paul
364a8fe9a2 am 5aeed158: Merge "Added explicit sort order when fetching accounts." into lmp-mr1-dev 
* commit '5aeed158df65847edac69761630dcd66b8f66eaa':
  Added explicit sort order when fetching accounts.
 2014-12-02 18:45:53 +00:00
Junda Liu
92205a3365 am 50e2d6c2: am ef6178a9: Merge "Add hasMatchedTetherApnSetting to telmgr API." into lmp-mr1-dev 
* commit '50e2d6c2ce079c00531ecbcf112593cb0263e47a':
  Add hasMatchedTetherApnSetting to telmgr API.
 2014-12-02 18:45:41 +00:00
Marvin Paul
5aeed158df Merge "Added explicit sort order when fetching accounts." into lmp-mr1-dev 2014-12-02 18:36:32 +00:00
Marvin Paul
48fcd4e175 Added explicit sort order when fetching accounts. 
In SQLite, if a sort order is not specified then the ordering is
undefined. In pre-L, SQLite would order accounts by the primary key.
But in L, the newer SQLite version appears to be ordering accounts by
the name.

Bug 18453759

Change-Id: I6bf2b0de59eca4c69472b4279b9e4194c3d3471e
 2014-12-02 18:30:57 +00:00
Junda Liu
50e2d6c2ce am ef6178a9: Merge "Add hasMatchedTetherApnSetting to telmgr API." into lmp-mr1-dev 
* commit 'ef6178a99c57b6de3dc02455e570f932b154b8e1':
  Add hasMatchedTetherApnSetting to telmgr API.
 2014-12-02 18:23:49 +00:00
Craig Mautner
4bc4974374 am 8abe01aa: am a370d9d1: am f54954f9: Merge "bug fix possible NPE while startProcessLocked()" 
* commit '8abe01aa80a0697d21103322ac500dce31058b50':
  bug fix possible NPE while startProcessLocked()
 2014-12-02 18:19:45 +00:00
Junda Liu
ef6178a99c Merge "Add hasMatchedTetherApnSetting to telmgr API." into lmp-mr1-dev 2014-12-02 18:18:24 +00:00
Craig Mautner
2d223d4e93 am b361f48b: am ca017a38: am 50f513c5: Merge "[ActivityManager] Invalidate last screenshot when activity relaunched" 
* commit 'b361f48b38f89c029a4ea5548d876f34fd74a7fc':
  [ActivityManager] Invalidate last screenshot when activity relaunched
 2014-12-02 18:11:59 +00:00
Craig Mautner
8abe01aa80 am a370d9d1: am f54954f9: Merge "bug fix possible NPE while startProcessLocked()" 
* commit 'a370d9d19af04c2a9f9d5c5b5794a6a5cd6fd774':
  bug fix possible NPE while startProcessLocked()
 2014-12-02 18:11:25 +00:00
Craig Mautner
b361f48b38 am ca017a38: am 50f513c5: Merge "[ActivityManager] Invalidate last screenshot when activity relaunched" 
* commit 'ca017a38c9eb12fe92d24a72ad3ee4c33b00e5de':
  [ActivityManager] Invalidate last screenshot when activity relaunched
 2014-12-02 18:04:10 +00:00
Craig Mautner
f54954f975 Merge "bug fix possible NPE while startProcessLocked()" 2014-12-02 17:57:14 +00:00
Christoph Studer
d3d9615db8 am bfecab14: am ef1073f7: am ff02faf8: Merge "NoMan: Optimize grouped notifications" into lmp-mr1-dev 
* commit 'bfecab14f92067ee6104ab419bd8a4c7dcd5d03e':
  NoMan: Optimize grouped notifications
 2014-12-02 15:59:18 +00:00
Christoph Studer
bfecab14f9 am ef1073f7: am ff02faf8: Merge "NoMan: Optimize grouped notifications" into lmp-mr1-dev 
* commit 'ef1073f7b45873b5fb87d772c0a5036a2b274917':
  NoMan: Optimize grouped notifications
 2014-12-02 15:52:20 +00:00
Christoph Studer
1f32c65697 NoMan/SysUI: Clear LEDs only when entering the shade 
Don't clear notification LEDs when seeing notifications on the
lockscreen.

Also fix a bug where the LED didn't continue flashing after
the screen turned off.

For devices with doze capability, ensure that the LED continuing
to flash after screen off doesn't cause an immediate pulses, but
delay the first pulse by 10s.

Bug: 15449039
Change-Id: Id34d51a2c91ceaf069e49add1ab690bb855f9638
 2014-12-02 16:52:13 +01:00
Christoph Studer
ef1073f7b4 am ff02faf8: Merge "NoMan: Optimize grouped notifications" into lmp-mr1-dev 
* commit 'ff02faf8f3db791956a99ff0bb87eafb52f333d4':
  NoMan: Optimize grouped notifications
 2014-12-02 15:45:01 +00:00
Christoph Studer
ff02faf8f3 Merge "NoMan: Optimize grouped notifications" into lmp-mr1-dev 2014-12-02 15:40:10 +00:00
Dongwon Kang
0e7a556844 am b076324c: am 3599af39: am 7cfe00f6: Merge "TIF: fix a race condition when TvInputManager is initialized" into lmp-mr1-dev 
* commit 'b076324c64060161e75c35f43c688f7cf067e396':
  TIF: fix a race condition when TvInputManager is initialized
 2014-12-02 07:42:50 +00:00
Dongwon Kang
b076324c64 am 3599af39: am 7cfe00f6: Merge "TIF: fix a race condition when TvInputManager is initialized" into lmp-mr1-dev 
* commit '3599af39e45af0498daa4873216a8cf4d6fe67f9':
  TIF: fix a race condition when TvInputManager is initialized
 2014-12-02 07:36:05 +00:00
Dongwon Kang
3599af39e4 am 7cfe00f6: Merge "TIF: fix a race condition when TvInputManager is initialized" into lmp-mr1-dev 
* commit '7cfe00f69380573e9c989bbbc614930c279f2291':
  TIF: fix a race condition when TvInputManager is initialized
 2014-12-02 07:29:10 +00:00
Dongwon Kang
7cfe00f693 Merge "TIF: fix a race condition when TvInputManager is initialized" into lmp-mr1-dev 2014-12-02 07:26:07 +00:00
Lorenzo Colitti
f89d840c87 am 5d1aeef0: am 28ca40ff: am 32f3518d: Merge "Only use mDefaultDns if the network claims to offer Internet" into lmp-mr1-dev 
* commit '5d1aeef0e98e93fd3031522a61d53b1786e7effb':
  Only use mDefaultDns if the network claims to offer Internet
 2014-12-02 07:07:41 +00:00
Lorenzo Colitti
5d1aeef0e9 am 28ca40ff: am 32f3518d: Merge "Only use mDefaultDns if the network claims to offer Internet" into lmp-mr1-dev 
* commit '28ca40ff78dc5e62d0e26e7340b74ad6e5ba767e':
  Only use mDefaultDns if the network claims to offer Internet
 2014-12-02 07:00:45 +00:00