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

167606 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jinsuk Kim
6cbb42186e am 05fefb69: am 18279da7: am f55cdab4: resolved conflicts for merge of f9a924ab to lmp-mr1-dev 
* commit '05fefb69758f5cf260cdf4ae374a3a4c519cf437':
  DO NOT MERGE CEC: Queue actions for starting later when not ready
 2014-10-15 07:30:46 +00:00
Jinsuk Kim
05fefb6975 am 18279da7: am f55cdab4: resolved conflicts for merge of f9a924ab to lmp-mr1-dev 
* commit '18279da701aff24dbf6c4aa5e76236a28d3425ea':
  DO NOT MERGE CEC: Queue actions for starting later when not ready
 2014-10-15 07:26:22 +00:00
Jinsuk Kim
18279da701 am f55cdab4: resolved conflicts for merge of f9a924ab to lmp-mr1-dev 
* commit 'f55cdab4bf9f9206d77748d0774065dc8438af0f':
  DO NOT MERGE CEC: Queue actions for starting later when not ready
 2014-10-15 07:22:15 +00:00
Jinsuk Kim
f55cdab4bf resolved conflicts for merge of f9a924ab to lmp-mr1-dev 
Change-Id: Ic0693b6f2fdb2ea32a280297624b1fe435385deb
 2014-10-15 14:55:57 +09:00
Jinsuk Kim
f9a924ab81 am 5873c3e8: Merge "DO NOT MERGE CEC: Queue actions for starting later when not ready" into lmp-dev 
* commit '5873c3e862b83fb0c64b52b86bdd8f26ff8ffb5f':
  DO NOT MERGE CEC: Queue actions for starting later when not ready
 2014-10-15 05:16:12 +00:00
Jinsuk Kim
5873c3e862 Merge "DO NOT MERGE CEC: Queue actions for starting later when not ready" into lmp-dev 2014-10-15 05:11:00 +00:00
Jeff Sharkey
7b2993c565 am 6449ba6d: am 92ab2748: am 4d526bd2: am cf2c5649: am 97978808: Start cross profile intents as caller. 
* commit '6449ba6d8c12747e74ab6d1fd0fa8730f4a5d512':
  Start cross profile intents as caller.
 2014-10-15 03:35:39 +00:00
Jeff Sharkey
6449ba6d8c am 92ab2748: am 4d526bd2: am cf2c5649: am 97978808: Start cross profile intents as caller. 
* commit '92ab2748efc185a347d11e1382d54b86ffd22799':
  Start cross profile intents as caller.
 2014-10-15 03:21:58 +00:00
Svetoslav
310631c481 am 1024e3a0: am f38b9c2e: am 0e58b6ab: am 1a55dcce: am dc876b56: Merge "Fix a NPE in device policy manager service." into lmp-dev 
* commit '1024e3a061de32a93d886814ed288dd18650a409':
  Fix a NPE in device policy manager service.
 2014-10-15 03:06:33 +00:00
Alan Viverette
96f517c1d4 am db2031e2: am ba4bbe79: am 6f1edae8: Merge "Send VIEW_SELECTED event when View selection state changes" into lmp-mr1-dev 
* commit 'db2031e215ab9aca0d41a0dd7f8f571f6bd94110':
  Send VIEW_SELECTED event when View selection state changes
 2014-10-15 03:06:26 +00:00
Jeff Sharkey
92ab2748ef am 4d526bd2: am cf2c5649: am 97978808: Start cross profile intents as caller. 
* commit '4d526bd249d720ef8dc54b8c7ecef9953e5be5c7':
  Start cross profile intents as caller.
 2014-10-15 03:06:00 +00:00
Svetoslav
1024e3a061 am f38b9c2e: am 0e58b6ab: am 1a55dcce: am dc876b56: Merge "Fix a NPE in device policy manager service." into lmp-dev 
* commit 'f38b9c2e9f03fe8e361d310271a842badf754620':
  Fix a NPE in device policy manager service.
 2014-10-15 02:30:33 +00:00
Alan Viverette
db2031e215 am ba4bbe79: am 6f1edae8: Merge "Send VIEW_SELECTED event when View selection state changes" into lmp-mr1-dev 
* commit 'ba4bbe79c2610bd4c0525837ad6654e0e36fd32d':
  Send VIEW_SELECTED event when View selection state changes
 2014-10-15 02:30:22 +00:00
Craig Mautner
c57c44d78a am 1d1ebed3: am 62110657: am b99419aa: am 27f80673: am ea496644: Merge "Add null check" into lmp-dev 
* commit '1d1ebed3388b5294d6edbd416eb684631e00f894':
  Add null check
 2014-10-15 02:23:13 +00:00
Tom Taylor
c03379a009 am a51fa5dd: am ec10c016: am e1b2fc5c: Merge "Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager" into lmp-mr1-dev 
* commit 'a51fa5dd9c7018df63186de0826af72fb3e44ba4':
  Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
 2014-10-15 02:23:07 +00:00
Winson Chung
119f1daadb am cbd99dd8: am a4ef863c: am f4d065e5: Merge "Fixing regression with screen pinning button not animating for the first task. (Bug 17985087)" into lmp-mr1-dev 
* commit 'cbd99dd853078a8b13205a2c017d8bb55e972ab6':
  Fixing regression with screen pinning button not animating for the first task. (Bug 17985087)
 2014-10-15 02:23:02 +00:00
Winson Chung
725d63f56c am c0faa993: am c6fe2b51: am db8d39f8: Merge "Fixing issue with excluded tasks sometimes showing in Recents. (Bug 17875770)" into lmp-mr1-dev 
* commit 'c0faa9930712710e3d9f65e07f586cf0d7b6bfaf':
  Fixing issue with excluded tasks sometimes showing in Recents. (Bug 17875770)
 2014-10-15 02:22:57 +00:00
Jason Monk
1928daf290 am 048a2d3c: am 417bc6cc: am 68cb9fcc: am a1a0131a: am f97e71a6: Merge "Update screen pinning and recents strings to say Overview" into lmp-dev 
* commit '048a2d3c71ef78d03144dc6fa5e0186056992cce':
  Update screen pinning and recents strings to say Overview
 2014-10-15 02:22:51 +00:00
Winson Chung
5c998695c7 am c76ad871: am 29d82bbf: am 799819af: Merge "Removing unused/dead code related to footer and screenshot transition." into lmp-mr1-dev 
* commit 'c76ad871bab4183e604f5fa0e332036132689a10':
  Removing unused/dead code related to footer and screenshot transition.
 2014-10-15 02:22:46 +00:00
Alan Viverette
0dfd1e2eb1 am 6ee5699b: am eecfb52a: am 9a00cbcc: Merge "Update preload list, clean up drawable theming" into lmp-mr1-dev 
* commit '6ee5699b225db260b0660ee93e7ed2d542b4c962':
  Update preload list, clean up drawable theming
 2014-10-15 02:22:41 +00:00
Winson Chung
5480b35842 am 1a97602f: am 744d25e0: am 669eef66: Merge "Adding mouse wheel support. (Bug 17323718)" into lmp-mr1-dev 
* commit '1a97602f1489df816dbd2191d9f12e7e850ec74d':
  Adding mouse wheel support. (Bug 17323718)
 2014-10-15 02:22:36 +00:00
Selim Cinek
16403c2d5b am 9f6c8867: am 4c8ce9f2: am 8da1ef2f: am 351ec77b: am cedb6dc7: Merge "Fixed a bug when double tapping a notification in the normal shade" into lmp-dev 
* commit '9f6c88671764a62c54f60492da91298f22424ae2':
  Fixed a bug when double tapping a notification in the normal shade
 2014-10-15 02:22:30 +00:00
Ricardo Cervera-Navarro
bfa545dfd4 am 8b58a391: am 96400c7f: am 8df05a58: am ac293d16: am a4f9c087: am c93723bd: am 7668aa27: am aa7bcf14: Merge "Revert "docs: Watermarked images for codes that weren\'t found."" into klp-docs 
* commit '8b58a391a18ff0d0a18be417ff5089ffc21b9040':
  Revert "docs: Watermarked images for codes that weren't found."
 2014-10-15 02:22:24 +00:00
Jeff Hao
b179e6a963 am c2b90f06: am 8225e091: am 59ba1132: am 1201d2a0: am dbfbb175: Backport of ordering apps for boot dexopt. 
* commit 'c2b90f06d49cac6b6f0a336c13bd7748ff7de706':
  Backport of ordering apps for boot dexopt.
 2014-10-15 02:22:20 +00:00
Svetoslav
d0502d37fc am 4e3b2426: am a23ad0b7: am 0c8e15c0: am 60cdb909: am 0a1ffdb3: Merge "Handle if the printing app is killed while saving to PDF." into lmp-dev 
* commit '4e3b2426ac54557bf8502f3b1240a02e2b64a58b':
  Handle if the printing app is killed while saving to PDF.
 2014-10-15 02:22:15 +00:00
Filip Gruszczynski
a714e64cd1 am 6a0cebca: am e5a8dd22: am 3d5ecf13: am 129f1946: Merge "Prevent index out of bounds when using String.substring." into lmp-sprout-dev 
* commit '6a0cebca8083adee8cd4df4077d8d39db35fb23e':
  Prevent index out of bounds when using String.substring.
 2014-10-15 02:22:10 +00:00
Amith Yamasani
bc460b9c03 am d060a29e: am 6c0659e0: am 20791338: am 4bf0356e: am 15a5f82f: Merge "Hide DISALLOW_OUTGOING_BEAM API" into lmp-dev 
* commit 'd060a29e52fc73be53d643f74a9335652bd818ca':
  Hide DISALLOW_OUTGOING_BEAM API
 2014-10-15 02:22:05 +00:00
Dianne Hackborn
cfd38a3c63 am 133c747e: am 3c5a70e0: am f23b29ad: am a861a9d7: am 35de0e28: Merge "Fix issue #10034864: Define YouTube application as the preferred..." into lmp-dev 
* commit '133c747e1008069a31cf9b2f25955fff0a650a04':
  Fix issue #10034864: Define YouTube application as the preferred...
 2014-10-15 02:22:01 +00:00
Filip Gruszczynski
19efa97c1e am 38afe562: am f16d2264: am 31278350: am 72f6e8ce: Merge "Log wallpaper crashes." into lmp-sprout-dev 
* commit '38afe562043e5c98567af5fcc79d1fc274d8918c':
  Log wallpaper crashes.
 2014-10-15 02:21:57 +00:00
Rich Slogar
87cae383ed am d1baa50d: am cdfa492e: am b42cd383: am 389e4ccd: am a89ac60e: am 858cfad9: am a3287768: Merge "docs:SDK tools 23.0.5 Release Note" into klp-modular-docs 
* commit 'd1baa50d4fbda268a95468ff8988f49cb28d749e':
  docs:SDK tools 23.0.5 Release Note
 2014-10-15 02:21:44 +00:00
Nick Kralevich
15f193bffe am a26487cb: am 55bb6a7b: am 01edf579: am fce896fe: am 0ae82b05: resolved conflicts for merge of a4eb81b6 to lmp-dev 
* commit 'a26487cb28ea6bde6157463b6c48cc45b28fe41c':
  Docs: adding closing bracket to un-break javadoc tokens.
 2014-10-15 02:21:39 +00:00
Jeff Sharkey
4d526bd249 am cf2c5649: am 97978808: Start cross profile intents as caller. 
* commit 'cf2c564987965be1241fe197106b3ec22b11b4b0':
  Start cross profile intents as caller.
 2014-10-15 02:19:26 +00:00
Craig Mautner
1d1ebed338 am 62110657: am b99419aa: am 27f80673: am ea496644: Merge "Add null check" into lmp-dev 
* commit '6211065723d22048694b4854c904683c4ba86268':
  Add null check
 2014-10-15 02:10:44 +00:00
Tom Taylor
a51fa5dd9c am ec10c016: am e1b2fc5c: Merge "Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager" into lmp-mr1-dev 
* commit 'ec10c016cc082eb79c6ebc61505f4c0c6d1f179d':
  Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
 2014-10-15 02:09:03 +00:00
Winson Chung
cbd99dd853 am a4ef863c: am f4d065e5: Merge "Fixing regression with screen pinning button not animating for the first task. (Bug 17985087)" into lmp-mr1-dev 
* commit 'a4ef863c753e6756027c44a539ac02144ce614f9':
  Fixing regression with screen pinning button not animating for the first task. (Bug 17985087)
 2014-10-15 02:08:01 +00:00
Winson Chung
c0faa99307 am c6fe2b51: am db8d39f8: Merge "Fixing issue with excluded tasks sometimes showing in Recents. (Bug 17875770)" into lmp-mr1-dev 
* commit 'c6fe2b519316e7d234b303d0511fbaffc7f0be3b':
  Fixing issue with excluded tasks sometimes showing in Recents. (Bug 17875770)
 2014-10-15 02:07:54 +00:00
Jason Monk
048a2d3c71 am 417bc6cc: am 68cb9fcc: am a1a0131a: am f97e71a6: Merge "Update screen pinning and recents strings to say Overview" into lmp-dev 
* commit '417bc6cc5fdfc6f5c80016cf1b848268605acf11':
  Update screen pinning and recents strings to say Overview
 2014-10-15 02:07:48 +00:00
Winson Chung
c76ad871ba am 29d82bbf: am 799819af: Merge "Removing unused/dead code related to footer and screenshot transition." into lmp-mr1-dev 
* commit '29d82bbfc9f91ff87f7d71220f831e351bd2c0da':
  Removing unused/dead code related to footer and screenshot transition.
 2014-10-15 02:07:41 +00:00
Alan Viverette
6ee5699b22 am eecfb52a: am 9a00cbcc: Merge "Update preload list, clean up drawable theming" into lmp-mr1-dev 
* commit 'eecfb52ad56a3bb4f5bf2cdaeb83cfe8b33fa0c1':
  Update preload list, clean up drawable theming
 2014-10-15 02:07:34 +00:00
Winson Chung
1a97602f14 am 744d25e0: am 669eef66: Merge "Adding mouse wheel support. (Bug 17323718)" into lmp-mr1-dev 
* commit '744d25e0e3b75c8beba6f9a8e94d949b8f21d922':
  Adding mouse wheel support. (Bug 17323718)
 2014-10-15 02:07:28 +00:00
Selim Cinek
9f6c886717 am 4c8ce9f2: am 8da1ef2f: am 351ec77b: am cedb6dc7: Merge "Fixed a bug when double tapping a notification in the normal shade" into lmp-dev 
* commit '4c8ce9f22db9900594844e4e1206865c601f77d1':
  Fixed a bug when double tapping a notification in the normal shade
 2014-10-15 02:07:21 +00:00
Ricardo Cervera-Navarro
8b58a391a1 am 96400c7f: am 8df05a58: am ac293d16: am a4f9c087: am c93723bd: am 7668aa27: am aa7bcf14: Merge "Revert "docs: Watermarked images for codes that weren\'t found."" into klp-docs 
* commit '96400c7f93827a78468d2b2f7f22833ae3353152':
  Revert "docs: Watermarked images for codes that weren't found."
 2014-10-15 02:07:14 +00:00
Jeff Hao
c2b90f06d4 am 8225e091: am 59ba1132: am 1201d2a0: am dbfbb175: Backport of ordering apps for boot dexopt. 
* commit '8225e0915534c2c347bf2deeec0f903714ed2c04':
  Backport of ordering apps for boot dexopt.
 2014-10-15 02:07:09 +00:00
Svetoslav
4e3b2426ac am a23ad0b7: am 0c8e15c0: am 60cdb909: am 0a1ffdb3: Merge "Handle if the printing app is killed while saving to PDF." into lmp-dev 
* commit 'a23ad0b7dd159e7fb0e8c2ff6b86683c7da6225e':
  Handle if the printing app is killed while saving to PDF.
 2014-10-15 02:07:02 +00:00
Jeff Sharkey
cf2c564987 am 97978808: Start cross profile intents as caller. 
* commit '9797880808320e3a7bae1f59bc7e0c5a13189e5f':
  Start cross profile intents as caller.
 2014-10-15 02:05:56 +00:00
Filip Gruszczynski
6a0cebca80 am e5a8dd22: am 3d5ecf13: am 129f1946: Merge "Prevent index out of bounds when using String.substring." into lmp-sprout-dev 
* commit 'e5a8dd222ab31d63c4f38fd87f909264f024530d':
  Prevent index out of bounds when using String.substring.
 2014-10-15 02:04:13 +00:00
Amith Yamasani
d060a29e52 am 6c0659e0: am 20791338: am 4bf0356e: am 15a5f82f: Merge "Hide DISALLOW_OUTGOING_BEAM API" into lmp-dev 
* commit '6c0659e0eba77972f1ba8a2ad2a51ea7b2c76b9a':
  Hide DISALLOW_OUTGOING_BEAM API
 2014-10-15 02:04:06 +00:00
Dianne Hackborn
133c747e10 am 3c5a70e0: am f23b29ad: am a861a9d7: am 35de0e28: Merge "Fix issue #10034864: Define YouTube application as the preferred..." into lmp-dev 
* commit '3c5a70e0314cd21d42eda406ed2239303b07e6e1':
  Fix issue #10034864: Define YouTube application as the preferred...
 2014-10-15 02:03:59 +00:00
Filip Gruszczynski
38afe56204 am f16d2264: am 31278350: am 72f6e8ce: Merge "Log wallpaper crashes." into lmp-sprout-dev 
* commit 'f16d226460cbe0800d8c3b614121cd8c09bdc9cb':
  Log wallpaper crashes.
 2014-10-15 02:03:51 +00:00
Rich Slogar
d1baa50d4f am cdfa492e: am b42cd383: am 389e4ccd: am a89ac60e: am 858cfad9: am a3287768: Merge "docs:SDK tools 23.0.5 Release Note" into klp-modular-docs 
* commit 'cdfa492e2420d97177f32a77e177bb7ba0c5ebb3':
  docs:SDK tools 23.0.5 Release Note
 2014-10-15 02:03:44 +00:00