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

166845 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
George Mount
7291d7b2c5 Merge "Fix javadoc." into lmp-mr1-dev automerge: 8b26674 
automerge: dd185b6

* commit 'dd185b657dba19e913e0e01a8213756fdd8e4cfc':
  Fix javadoc.
 2014-11-05 18:03:51 +00:00
George Mount
dd185b657d Merge "Fix javadoc." into lmp-mr1-dev 
automerge: 8b26674

* commit '8b26674aa139965005ff3ba7d284d7d557c2de61':
  Fix javadoc.
 2014-11-05 16:34:41 +00:00
John Spurlock
96171f08c1 Merge "Zen: Create a new exit condition for "next alarm"." into lmp-mr1-dev automerge: 0bdefb9 
automerge: 513f260

* commit '513f26020095c409aa3e828c98485ed20aa9eaa9':
  Zen: Create a new exit condition for "next alarm".
 2014-11-05 15:42:30 +00:00
John Spurlock
b16f943743 Merge "QS: Toggle tile icon animations." into lmp-mr1-dev automerge: 2face5e 
automerge: 055acca

* commit '055acca7c8691921572f8e9845bd4d46b96c7251':
  QS: Toggle tile icon animations.
 2014-11-05 15:41:12 +00:00
George Mount
8b26674aa1 Merge "Fix javadoc." into lmp-mr1-dev 2014-11-05 15:22:43 +00:00
John Spurlock
513f260200 Merge "Zen: Create a new exit condition for "next alarm"." into lmp-mr1-dev 
automerge: 0bdefb9

* commit '0bdefb9953fd51c86f81a6033a00926a63916065':
  Zen: Create a new exit condition for "next alarm".
 2014-11-05 15:20:12 +00:00
John Spurlock
055acca7c8 Merge "QS: Toggle tile icon animations." into lmp-mr1-dev 
automerge: 2face5e

* commit '2face5e2e86cb7850c2ce67306f5aad04af6f597':
  QS: Toggle tile icon animations.
 2014-11-05 15:19:02 +00:00
John Spurlock
0bdefb9953 Merge "Zen: Create a new exit condition for "next alarm"." into lmp-mr1-dev 2014-11-05 14:47:20 +00:00
John Spurlock
2face5e2e8 Merge "QS: Toggle tile icon animations." into lmp-mr1-dev 2014-11-05 14:47:03 +00:00
John Spurlock
c6df3cf273 QS: Toggle tile icon animations. 
- New location tile icon animation.
 - New flashlight tile icon animation.
 - New airplane-mode tile icon animation.
 - New color inversion tile icon animation.
 - Remove obsolete static icons.

Bug: 17426910
Change-Id: I51c98979afd46f4cdfc2fd383e80d7bf13c5eeab
 2014-11-05 09:20:16 -05:00
John Spurlock
37bc92cc23 Zen: Create a new exit condition for "next alarm". 
- If the user's next alarm is in the next 12 hrs, provide
this as an exit condition trigger for leaving none/priority.
- Don't display the next alarm condition when downtime is active.
- When the next-alarm exit condition is active, follow changes
to the next alarm, assuming it remains within the 12-hr window.
- Tweak the downtime condition strings to be consistent.

Bug: 16373455
Change-Id: I4020b91d323dead998e62d655132eca07438b148
 2014-11-05 08:46:01 -05:00
Jungshik Jang
af45240bf0 am 9ae3fe48: am 09035486: Merge "Add recorder address to all recording listerner apis." into lmp-mr1-dev 
* commit '9ae3fe48d912d9135684d435d282fa2bb4929a2e':
  Add recorder address to all recording listerner apis.
 2014-11-05 06:29:24 +00:00
Jungshik Jang
9ae3fe48d9 am 09035486: Merge "Add recorder address to all recording listerner apis." into lmp-mr1-dev 
* commit '090354861a92c1cf0c8c2baa438d1b770d67dd9f':
  Add recorder address to all recording listerner apis.
 2014-11-05 06:18:44 +00:00
Jungshik Jang
090354861a Merge "Add recorder address to all recording listerner apis." into lmp-mr1-dev 2014-11-05 05:54:15 +00:00
Alan Viverette
b6416716ad am 6a98dde8: am 9342b049: Merge "Use default token instead of wrapped window manager" into lmp-mr1-dev 
* commit '6a98dde8dffac83283850afaec4400db9146a3e5':
  Use default token instead of wrapped window manager
 2014-11-05 04:56:40 +00:00
Alan Viverette
6a98dde8df am 9342b049: Merge "Use default token instead of wrapped window manager" into lmp-mr1-dev 
* commit '9342b049b9a605b1904e03f904ec3cbf90f7742d':
  Use default token instead of wrapped window manager
 2014-11-05 04:50:50 +00:00
Tom Taylor
dda730646e am 53a5acd0: am 8da5180d: am 865a6582: am 4e985118: am 6209d4e4: am 7c570346: am 47419a44: am 192a3904: am 23fb2972: am d7044fe1: am b2e54c1b: am 75e7fbaa: am 37906e6e: am 44f6d0d5: am 4c5b16d7: am 66aa87ae: am 90743d64: am bfb7ffeb: Externally Reported Moderate Secur 
* commit '53a5acd096e222e5cbab94dfa5d4c5fde257d7f7':
  Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
 2014-11-05 04:47:59 +00:00
Tom Taylor
42dc4531d5 am 0e69335f: am 77037113: am dd41b629: am f2f59e7a: am db864e4d: am 52449372: am bc57a1f8: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager 
* commit '0e69335f1acc9effe6435a628a7ba44f7073f215':
  Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
 2014-11-05 04:47:53 +00:00
Alan Viverette
c128a576f6 am 3ea1a3e7: am 44eb8b77: Revert "When keyguard exits use same anim for all windows" 
* commit '3ea1a3e781717dee16e3338db6fc59d1358d76ed':
  Revert "When keyguard exits use same anim for all windows"
 2014-11-05 04:47:47 +00:00
Alan Viverette
9342b049b9 Merge "Use default token instead of wrapped window manager" into lmp-mr1-dev 2014-11-05 04:44:22 +00:00
Tom Taylor
53a5acd096 am 8da5180d: am 865a6582: am 4e985118: am 6209d4e4: am 7c570346: am 47419a44: am 192a3904: am 23fb2972: am d7044fe1: am b2e54c1b: am 75e7fbaa: am 37906e6e: am 44f6d0d5: am 4c5b16d7: am 66aa87ae: am 90743d64: am bfb7ffeb: Externally Reported Moderate Security Issue: SQ 
* commit '8da5180d3debf8bf47e8d19e8d606e38580b0a84':
  Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
 2014-11-05 04:41:34 +00:00
Tom Taylor
0e69335f1a am 77037113: am dd41b629: am f2f59e7a: am db864e4d: am 52449372: am bc57a1f8: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager 
* commit '77037113a8d654451a3890fecb2e6be4bd679634':
  Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
 2014-11-05 04:41:28 +00:00
Alan Viverette
3ea1a3e781 am 44eb8b77: Revert "When keyguard exits use same anim for all windows" 
* commit '44eb8b772984164666195ea71c685292b234549a':
  Revert "When keyguard exits use same anim for all windows"
 2014-11-05 04:41:23 +00:00
Tom Taylor
8da5180d3d am 865a6582: am 4e985118: am 6209d4e4: am 7c570346: am 47419a44: am 192a3904: am 23fb2972: am d7044fe1: am b2e54c1b: am 75e7fbaa: am 37906e6e: am 44f6d0d5: am 4c5b16d7: am 66aa87ae: am 90743d64: am bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection i 
* commit '865a6582462a132c3d579b0cae0792062d76833e':
  Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
 2014-11-05 04:36:34 +00:00
Tom Taylor
77037113a8 am dd41b629: am f2f59e7a: am db864e4d: am 52449372: am bc57a1f8: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager 
* commit 'dd41b6292433915b5b470c61476afca11df043e3':
  Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
 2014-11-05 04:36:20 +00:00
Alan Viverette
44eb8b7729 Revert "When keyguard exits use same anim for all windows" 
Broke window animations.

This reverts commit b83408018176ec58f50e792590a22fdc9eb87fff.

BUG: 18248641
Change-Id: Ic456a5666c3199e8bb8c9c2fb1ecdbb82afaad86
 2014-11-04 20:34:41 -08:00
Jungshik Jang
326aef0c94 Add recorder address to all recording listerner apis. 
It enables to recognize which recorder reports record status.

Bug: 18248734
Change-Id: I248ad77212ce584dc16863cbe00639e7ac3c184a
 2014-11-05 13:32:52 +09:00
Tom Taylor
865a658246 am 4e985118: am 6209d4e4: am 7c570346: am 47419a44: am 192a3904: am 23fb2972: am d7044fe1: am b2e54c1b: am 75e7fbaa: am 37906e6e: am 44f6d0d5: am 4c5b16d7: am 66aa87ae: am 90743d64: am bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushMana 
* commit '4e9851183daf26d602d641917378d55a9516f128':
  Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
 2014-11-05 04:26:13 +00:00
Tom Taylor
dd41b62924 am f2f59e7a: am db864e4d: am 52449372: am bc57a1f8: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager 
* commit 'f2f59e7ab916e37d510db151904c95c42006ae08':
  Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
 2014-11-05 04:26:09 +00:00
Tom Taylor
4e9851183d am 6209d4e4: am 7c570346: am 47419a44: am 192a3904: am 23fb2972: am d7044fe1: am b2e54c1b: am 75e7fbaa: am 37906e6e: am 44f6d0d5: am 4c5b16d7: am 66aa87ae: am 90743d64: am bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager 
* commit '6209d4e4d8a8662628c53cd5e1944abf30293d87':
  Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
 2014-11-05 04:21:07 +00:00
Tom Taylor
f2f59e7ab9 am db864e4d: am 52449372: am bc57a1f8: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager 
* commit 'db864e4ddc788a21db6793bbcb5f559131f20736':
  Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
 2014-11-05 04:20:11 +00:00
Alan Viverette
e48b397f93 am 405165b6: am a446195b: Merge "Fix hasSurfaceInsets check when creating hardware renderer" into lmp-mr1-dev 
* commit '405165b6cd749d0281bb1daa13bdf0a8f38112d9':
  Fix hasSurfaceInsets check when creating hardware renderer
 2014-11-05 04:06:21 +00:00
Andres Morales
5bfdf03a82 am 4f781559: am 67198830: Merge "Increase min free levels for cached processes on 64bit" into lmp-mr1-dev 
* commit '4f781559ecc562f6e3fa8df79dd38066b8ceaa63':
  Increase min free levels for cached processes on 64bit
 2014-11-05 04:06:05 +00:00
Alan Viverette
69eb010b1e am a77e349a: am 9c95264e: Merge "Abort accessibility node prefetch if parent node is null" into lmp-mr1-dev 
* commit 'a77e349a3609833c55ee3b8b80fc5eef5fac4f1a':
  Abort accessibility node prefetch if parent node is null
 2014-11-05 04:05:58 +00:00
Craig Mautner
5f433b350d am bf8e9884: am 26a733ce: Merge "When keyguard exits use same anim for all windows" into lmp-mr1-dev 
* commit 'bf8e9884f1ea096254d04eff266aa3dfa1bc5e11':
  When keyguard exits use same anim for all windows
 2014-11-05 04:05:52 +00:00
Stuart Scott
1e5275da2f am fc1e8477: am 8585e0dd: Merge "Use CharSequence for DisplayName" into lmp-mr1-dev 
* commit 'fc1e84777c957bb094f793f8d286e873d070e7e0':
  Use CharSequence for DisplayName
 2014-11-05 04:05:41 +00:00
Wale Ogunwale
9be76b0e40 am ed247003: Merge "Fix issue #18240452: No recents screenshot when resuming from keyguard." into lmp-mr1-dev automerge: c56a1f1 
* commit 'ed247003857b7d1c0200a2e3102a6d263eb457bb':
  Fix issue #18240452: No recents screenshot when resuming from keyguard.
 2014-11-05 04:05:27 +00:00
Alan Viverette
405165b6cd am a446195b: Merge "Fix hasSurfaceInsets check when creating hardware renderer" into lmp-mr1-dev 
* commit 'a446195b0d22659ff402e3b6ac76b1b876e5fe3b':
  Fix hasSurfaceInsets check when creating hardware renderer
 2014-11-05 02:35:15 +00:00
Andres Morales
4f781559ec am 67198830: Merge "Increase min free levels for cached processes on 64bit" into lmp-mr1-dev 
* commit '671988302e344f18a0b6b2257c968a707c2189aa':
  Increase min free levels for cached processes on 64bit
 2014-11-05 02:35:09 +00:00
Alan Viverette
a77e349a36 am 9c95264e: Merge "Abort accessibility node prefetch if parent node is null" into lmp-mr1-dev 
* commit '9c95264e847b02b688e12a3dd75b1e54502b3246':
  Abort accessibility node prefetch if parent node is null
 2014-11-05 02:35:04 +00:00
Craig Mautner
bf8e9884f1 am 26a733ce: Merge "When keyguard exits use same anim for all windows" into lmp-mr1-dev 
* commit '26a733ce339380f98b4206654b38bf8fd000dda9':
  When keyguard exits use same anim for all windows
 2014-11-05 02:34:57 +00:00
Stuart Scott
fc1e84777c am 8585e0dd: Merge "Use CharSequence for DisplayName" into lmp-mr1-dev 
* commit '8585e0dd4c7cf7b883de9cd40dc81099abe246c4':
  Use CharSequence for DisplayName
 2014-11-05 02:18:35 +00:00
Alan Viverette
a446195b0d Merge "Fix hasSurfaceInsets check when creating hardware renderer" into lmp-mr1-dev 2014-11-05 02:09:30 +00:00
Andres Morales
671988302e Merge "Increase min free levels for cached processes on 64bit" into lmp-mr1-dev 2014-11-05 01:48:22 +00:00
Alan Viverette
9c95264e84 Merge "Abort accessibility node prefetch if parent node is null" into lmp-mr1-dev 2014-11-05 01:41:28 +00:00
Alan Viverette
d2fa514391 Use default token instead of wrapped window manager 
BUG: 18248602
Change-Id: Id7f06c896dc71db3564fa21d3704222557613035
 2014-11-04 17:40:29 -08:00
Andres Morales
97621e05c0 Increase min free levels for cached processes on 64bit 
Requires less memory pressure to start killing cached
processes.

Bug: 18241791
Change-Id: Ia02f5aee115535badc900330b9361f0099203e4f
 2014-11-05 01:36:27 +00:00
Wale Ogunwale
ed24700385 Merge "Fix issue #18240452: No recents screenshot when resuming from keyguard." into lmp-mr1-dev 
automerge: c56a1f1

* commit 'c56a1f17153844c8015a440ed52e84bbce0b894f':
  Fix issue #18240452: No recents screenshot when resuming from keyguard.
 2014-11-05 01:25:09 +00:00
Craig Mautner
26a733ce33 Merge "When keyguard exits use same anim for all windows" into lmp-mr1-dev 2014-11-05 01:23:04 +00:00
Stuart Scott
8585e0dd4c Merge "Use CharSequence for DisplayName" into lmp-mr1-dev 2014-11-05 01:19:12 +00:00