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

169918 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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-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
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-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
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
Svet Ganov
eaaf0512fc Crash in print spooler when back pressed before content update complted. 
We are updating the printed content asynchronously. If the user cancels
printing before the first update is complete the spooler components are
in a destroyed state but we attempt to handle the completed update resulting
in a crash. Now if printing is cancelled we ignore the update result.

bug:18525491

Change-Id: I1ef47a17de19896cba2c7a1dd2bfc205065e0a5a
 2014-12-02 18:43:05 +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
Ricardo Cervera-Navarro
1108b845f9 Merge "Sensor documentation fixes." into lmp-docs 2014-12-02 18:33:50 +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
Junda Liu
ef6178a99c Merge "Add hasMatchedTetherApnSetting to telmgr API." into lmp-mr1-dev 2014-12-02 18:18:24 +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
a370d9d19a am f54954f9: Merge "bug fix possible NPE while startProcessLocked()" 
* commit 'f54954f97599f83584ab736d931b1fe1aff8890c':
  bug fix possible NPE while startProcessLocked()
 2014-12-02 18:03:46 +00:00
Craig Mautner
f54954f975 Merge "bug fix possible NPE while startProcessLocked()" 2014-12-02 17:57:14 +00:00
Craig Mautner
ca017a38c9 am 50f513c5: Merge "[ActivityManager] Invalidate last screenshot when activity relaunched" 
* commit '50f513c56989337aa0a48304213dd1deee2a0ede':
  [ActivityManager] Invalidate last screenshot when activity relaunched
 2014-12-02 17:56:09 +00:00
Craig Mautner
50f513c569 Merge "[ActivityManager] Invalidate last screenshot when activity relaunched" 2014-12-02 17:50:31 +00:00
Luan Nguyen
3a8d6c8086 am a7ee1243: am dc1baa16: am 2711a539: am 16d0ab86: am 6cd78bb2: Merge "docs: Update getting started creating Wearable apps with proper prereqs and instructions." into lmp-docs 
* commit 'a7ee124305de16fa3acecbb087c0b0cbb1bc649b':
  docs: Update getting started creating Wearable apps with proper prereqs and instructions.
 2014-12-02 17:25:31 +00:00
Jean-Michel Trivi
8e74a8a77e am 874e4502: am 57457b98: Merge "AudioMix address and type, rule exclusion API, dynamic source" into lmp-mr1-dev 
* commit '874e4502217aa48a06171a7d880b9ca571fd76b1':
  AudioMix address and type, rule exclusion API, dynamic source
 2014-12-02 17:25:24 +00:00
Luan Nguyen
a7ee124305 am dc1baa16: am 2711a539: am 16d0ab86: am 6cd78bb2: Merge "docs: Update getting started creating Wearable apps with proper prereqs and instructions." into lmp-docs 
* commit 'dc1baa16b1c559b07d392f7d899fcfe18fa7036c':
  docs: Update getting started creating Wearable apps with proper prereqs and instructions.
 2014-12-02 17:17:11 +00:00
Jean-Michel Trivi
874e450221 am 57457b98: Merge "AudioMix address and type, rule exclusion API, dynamic source" into lmp-mr1-dev 
* commit '57457b98cfec197283c42585a3bc4abb1b21d05b':
  AudioMix address and type, rule exclusion API, dynamic source
 2014-12-02 17:17:06 +00:00
Chris Craik
faf4a61a88 am 363f0d9f: am 81defc6a: Merge "Sync ViewOverlay size init with RenderNode" into lmp-mr1-dev 
* commit '363f0d9fd92129c07d769e43fbc9b46dacc01a3b':
  Sync ViewOverlay size init with RenderNode
 2014-12-02 17:13:08 +00:00
Luan Nguyen
dc1baa16b1 am 2711a539: am 16d0ab86: am 6cd78bb2: Merge "docs: Update getting started creating Wearable apps with proper prereqs and instructions." into lmp-docs 
* commit '2711a5394950f2c61d2cd2ca7f9cfa141a96df34':
  docs: Update getting started creating Wearable apps with proper prereqs and instructions.
 2014-12-02 17:10:49 +00:00
Jean-Michel Trivi
57457b98cf Merge "AudioMix address and type, rule exclusion API, dynamic source" into lmp-mr1-dev 2014-12-02 17:09:30 +00:00
Chris Craik
363f0d9fd9 am 81defc6a: Merge "Sync ViewOverlay size init with RenderNode" into lmp-mr1-dev 
* commit '81defc6a840367dcf9591d14b827f2d8d756ef00':
  Sync ViewOverlay size init with RenderNode
 2014-12-02 17:04:34 +00:00
Luan Nguyen
2711a53949 am 16d0ab86: am 6cd78bb2: Merge "docs: Update getting started creating Wearable apps with proper prereqs and instructions." into lmp-docs 
* commit '16d0ab86eba2e4f596ac1b96b53391dd0f146b57':
  docs: Update getting started creating Wearable apps with proper prereqs and instructions.
 2014-12-02 17:00:23 +00:00
Chris Craik
81defc6a84 Merge "Sync ViewOverlay size init with RenderNode" into lmp-mr1-dev 2014-12-02 16:59:21 +00:00
Luan Nguyen
16d0ab86eb am 6cd78bb2: Merge "docs: Update getting started creating Wearable apps with proper prereqs and instructions." into lmp-docs 
* commit '6cd78bb2613260b0eb8341748d5cebe4a46f10e5':
  docs: Update getting started creating Wearable apps with proper prereqs and instructions.
 2014-12-02 16:50:36 +00:00
Luan Nguyen
6cd78bb261 Merge "docs: Update getting started creating Wearable apps with proper prereqs and instructions." into lmp-docs 2014-12-02 16:42:56 +00:00
Jason Monk
2b618bff2d am 613c0555: am e47dc360: Merge "SysUI: Actual MSIM status bar support" into lmp-mr1-dev 
* commit '613c0555ae85a7b79669a4ea5f756f5bf04ac180':
  SysUI: Actual MSIM status bar support
 2014-12-02 16:00:03 +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
Jason Monk
613c0555ae am e47dc360: Merge "SysUI: Actual MSIM status bar support" into lmp-mr1-dev 
* commit 'e47dc36071884600c2b3c1dfe1ffe031fc9f0fde':
  SysUI: Actual MSIM status bar support
 2014-12-02 15:52:17 +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