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

169953 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Alan Viverette
73d28900e9 resolved conflicts for merge of 850cdbe5 to lmp-mr1-dev-plus-aosp 
Change-Id: Icb394ddc92eb64732993ef345284e63c9844f76b
 2014-12-02 13:58:27 -08: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
Craig Mautner
61a7b7cff5 am e4e7d2cd: am 41ec0400: Merge "Dismiss insecure keyguards if FLAG_SHOW_WHEN_LOCKED" into lmp-mr1-dev 
* commit 'e4e7d2cdf40407240d63ef4f0a3249e726a1d632':
  Dismiss insecure keyguards if FLAG_SHOW_WHEN_LOCKED
 2014-12-02 21:27:23 +00:00
Craig Mautner
e4e7d2cdf4 am 41ec0400: Merge "Dismiss insecure keyguards if FLAG_SHOW_WHEN_LOCKED" into lmp-mr1-dev 
* commit '41ec0400056daa97d40bd4a8225b7d4f0d665598':
  Dismiss insecure keyguards if FLAG_SHOW_WHEN_LOCKED
 2014-12-02 21:20:17 +00:00
Stuart Scott
cc4cd6e1ab am 15b2d9ab: am 4e779ecd: Merge "Subscription Info density-dependent text size and localized SIM slot index" into lmp-mr1-dev 
* commit '15b2d9ab44690156e067020e12b329997ef5bba6':
  Subscription Info density-dependent text size and localized SIM slot index
 2014-12-02 21:18:29 +00:00
Craig Mautner
41ec040005 Merge "Dismiss insecure keyguards if FLAG_SHOW_WHEN_LOCKED" into lmp-mr1-dev 2014-12-02 21:14:00 +00:00
Stuart Scott
15b2d9ab44 am 4e779ecd: Merge "Subscription Info density-dependent text size and localized SIM slot index" into lmp-mr1-dev 
* commit '4e779ecd56faad5901854e030f593c5d4ad3dee8':
  Subscription Info density-dependent text size and localized SIM slot index
 2014-12-02 21:11:48 +00:00
Stuart Scott
4e779ecd56 Merge "Subscription Info density-dependent text size and localized SIM slot index" into lmp-mr1-dev 2014-12-02 21:04:54 +00:00
Craig Mautner
ca0a124da0 Dismiss insecure keyguards if FLAG_SHOW_WHEN_LOCKED 
Windows that had FLAG_SHOW_WHEN_LOCKED and FLAG_DISMISS_KEYGUARD set
would ignore the FLAG_DISMISS_KEYGUARD if the lockscreen was
insecure. This change adds a test for insecure keyguards when the
two flags are set together.

Fixes bug 18563298.

Change-Id: I3027c7ec476d3ac15978f7e6a78b3c2050cbab02
 2014-12-02 12:43:18 -08: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
Ricardo Cervera
4c75415055 am 0e8c7737: am affe4732: am aa59bf2d: am a107b515: am 64f49162: docs: Layout fixes for the Custom UI on Wear class 
* commit '0e8c773775bf6d2ae9986a64b8aece332992c6d4':
  docs: Layout fixes for the Custom UI on Wear class
 2014-12-02 19:57:08 +00:00
Ricardo Cervera
0e8c773775 am affe4732: am aa59bf2d: am a107b515: am 64f49162: docs: Layout fixes for the Custom UI on Wear class 
* commit 'affe473213deb4b2d1b9354cc57e2f517840e21a':
  docs: Layout fixes for the Custom UI on Wear class
 2014-12-02 19:49:54 +00:00
Jorim Jaggi
d6cdffd1b3 am 5c1459f5: am dad13577: Merge "Update dark mode on notifications when content is updated" into lmp-mr1-dev 
* commit '5c1459f5e4ac9687a5fe602efa5f9ad4992c94a1':
  Update dark mode on notifications when content is updated
 2014-12-02 19:49:32 +00:00
Jorim Jaggi
5c1459f5e4 am dad13577: Merge "Update dark mode on notifications when content is updated" into lmp-mr1-dev 
* commit 'dad13577e5c699ab34e4243204cf767de4a0f0cd':
  Update dark mode on notifications when content is updated
 2014-12-02 19:41:43 +00:00
Ricardo Cervera
affe473213 am aa59bf2d: am a107b515: am 64f49162: docs: Layout fixes for the Custom UI on Wear class 
* commit 'aa59bf2dd81e974c37eff8be3b529ed48b0b59c3':
  docs: Layout fixes for the Custom UI on Wear class
 2014-12-02 19:41:30 +00:00
Dianne Hackborn
1c2f6ca136 am 2f58bab7: am 221b545c: Merge "Fix issue #18510117: Returning from an activity started with..." into lmp-mr1-dev 
* commit '2f58bab7b026fbe010aad8ae777f3abda295dc66':
  Fix issue #18510117: Returning from an activity started with...
 2014-12-02 19:40:10 +00:00
Kweku Adams
51de927f5a am fa99c345: am d537987b: Changing AUDIO_TURNED_ON constant. 
* commit 'fa99c345c440a37ae0cc74cba6ffd6e88ab9ddb2':
  Changing AUDIO_TURNED_ON constant.
 2014-12-02 19:40:04 +00:00
Alan Viverette
850cdbe58c am 71c5d62d: Merge "Consider RTL layout in DPAD navigation in AbsSeekBar" 
* commit '71c5d62d9680207c4d3d25ac3f590f3667b250eb':
  Consider RTL layout in DPAD navigation in AbsSeekBar
 2014-12-02 19:36:03 +00:00
Jorim Jaggi
dad13577e5 Merge "Update dark mode on notifications when content is updated" into lmp-mr1-dev 2014-12-02 19:35:42 +00:00
Dianne Hackborn
2f58bab7b0 am 221b545c: Merge "Fix issue #18510117: Returning from an activity started with..." into lmp-mr1-dev 
* commit '221b545cdaba2522fbb299428ac048641410c284':
  Fix issue #18510117: Returning from an activity started with...
 2014-12-02 19:33:28 +00:00
Kweku Adams
fa99c345c4 am d537987b: Changing AUDIO_TURNED_ON constant. 
* commit 'd537987b173f6b48f5196a2ae7d445af1a49e2bb':
  Changing AUDIO_TURNED_ON constant.
 2014-12-02 19:33:23 +00:00
Ricardo Cervera
aa59bf2dd8 am a107b515: am 64f49162: docs: Layout fixes for the Custom UI on Wear class 
* commit 'a107b5150b38a8c6585631b1773d6c10f682f42b':
  docs: Layout fixes for the Custom UI on Wear class
 2014-12-02 19:32:49 +00:00
Ricardo Cervera-Navarro
ab5a0c05e6 am b359f4a8: am fcae79f6: am d5412e35: am 0ac703fc: am 1108b845: Merge "Sensor documentation fixes." into lmp-docs 
* commit 'b359f4a871cbbeecafb3c9b310695ffb6e5280bd':
  Sensor documentation fixes.
 2014-12-02 19:31:32 +00:00
Dianne Hackborn
221b545cda Merge "Fix issue #18510117: Returning from an activity started with..." into lmp-mr1-dev 2014-12-02 19:22:07 +00:00
Alan Viverette
71c5d62d96 Merge "Consider RTL layout in DPAD navigation in AbsSeekBar" 2014-12-02 19:21:22 +00:00
Kweku Adams
d537987b17 Changing AUDIO_TURNED_ON constant. 
Changed so that it's set to a different value from WIFI_MULTICAST_ENABLED.

Change-Id: Ied3a2c2bf891f887ec3c7b5249453af4524c099a
 2014-12-02 19:18:13 +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
Ricardo Cervera
a107b5150b am 64f49162: docs: Layout fixes for the Custom UI on Wear class 
* commit '64f49162460eaddf49f9d56c5dc6a01f472e790c':
  docs: Layout fixes for the Custom UI on Wear class
 2014-12-02 19:13:54 +00:00
Ricardo Cervera-Navarro
b359f4a871 am fcae79f6: am d5412e35: am 0ac703fc: am 1108b845: Merge "Sensor documentation fixes." into lmp-docs 
* commit 'fcae79f65d60069f75c4db92a68d56c9eb8b5213':
  Sensor documentation fixes.
 2014-12-02 19:12:24 +00:00
Andrew Lee
b4501f0327 am 4cd124cf: am 4ef369fc: Merge "Rename VoLTE capability to HD audio." into lmp-mr1-dev 
* commit '4cd124cfcb9427465ad2bf206a66c0e10e4e330b':
  Rename VoLTE capability to HD audio.
 2014-12-02 19:08:19 +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
Ricardo Cervera
64f4916246 docs: Layout fixes for the Custom UI on Wear class 
Change-Id: I7e499374b5903fb3412c9c42a44c75f7a0bf28f0
 2014-12-02 11:05:22 -08:00
Craig Mautner
877d89399a am f6be7d17: Merge "[ActivityManager] Fix race condition in pss collection" 
* commit 'f6be7d177a740f86a4ae3b8685cc9e2f31506352':
  [ActivityManager] Fix race condition in pss collection
 2014-12-02 19:05:01 +00:00
Svet Ganov
66a1200156 am f9c93ba2: am eaaf0512: Crash in print spooler when back pressed before content update complted. 
* commit 'f9c93ba26790cf26df40d21d7e8b6e1e83391dd1':
  Crash in print spooler when back pressed before content update complted.
 2014-12-02 19:03:54 +00:00
Ricardo Cervera-Navarro
fcae79f65d am d5412e35: am 0ac703fc: am 1108b845: Merge "Sensor documentation fixes." into lmp-docs 
* commit 'd5412e35801243e14123f2a0f03759073eb20fb6':
  Sensor documentation fixes.
 2014-12-02 19:01:22 +00:00
Andrew Lee
4cd124cfcb am 4ef369fc: Merge "Rename VoLTE capability to HD audio." into lmp-mr1-dev 
* commit '4ef369fce92d0e140189f305783855d8ae27067d':
  Rename VoLTE capability to HD audio.
 2014-12-02 18:59:32 +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
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
Ricardo Cervera-Navarro
d5412e3580 am 0ac703fc: am 1108b845: Merge "Sensor documentation fixes." into lmp-docs 
* commit '0ac703fc8f4569338acc823221089c62480f0d7c':
  Sensor documentation fixes.
 2014-12-02 18:53:20 +00:00
Andrew Lee
4ef369fce9 Merge "Rename VoLTE capability to HD audio." into lmp-mr1-dev 2014-12-02 18:51:01 +00:00
Svet Ganov
f9c93ba267 am eaaf0512: Crash in print spooler when back pressed before content update complted. 
* commit 'eaaf0512fcbf03b926cdbbbb7f54df474ecf861a':
  Crash in print spooler when back pressed before content update complted.
 2014-12-02 18:50:41 +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
Ricardo Cervera-Navarro
0ac703fc8f am 1108b845: Merge "Sensor documentation fixes." into lmp-docs 
* commit '1108b845f940debde0c1959a9293cafdc264afcc':
  Sensor documentation fixes.
 2014-12-02 18:46:30 +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