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

154173 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Selim Cinek
4edea3b8f2 am ceeac743: am 8d6d6478: am 7f8acb8f: Merge "Fixed a crash with disapearing views" into lmp-dev 
* commit 'ceeac743b3e88c9bf027d89bb7ef22e5868487b6':
  Fixed a crash with disapearing views
 2014-09-26 20:44:30 +00:00
Kenny Guy
c9d6d5cf47 am c322e272: am 420050d8: am 25be3cd6: Merge "Uninstall for all users should check device admins." into lmp-dev 
* commit 'c322e272cf6f0514057f896d52931dea0dbfd3e5':
  Uninstall for all users should check device admins.
 2014-09-26 20:44:25 +00:00
RoboErik
e97581a89a am 5120438b: am 66bc433a: am cab05d54: Merge "Disable MediaSessionLegacyHelper debugging" into lmp-dev 
* commit '5120438b1014bda5667f8e86e0e4e297a5cee282':
  Disable MediaSessionLegacyHelper debugging
 2014-09-26 20:44:21 +00:00
RoboErik
73fb6b509b am 298314cb: am 7d111759: am c80873d5: Merge "Remove BT routes when BT is turned off" into lmp-dev 
* commit '298314cb4955f24cde8f6d58ae390ce0511715ec':
  Remove BT routes when BT is turned off
 2014-09-26 20:44:16 +00:00
Selim Cinek
500581c64c am 1eca6803: am edccb1be: am a9827245: Merge "Increased the falsing threshold when woken up by touch" into lmp-dev 
* commit '1eca68030d40f0e17684a3afe7cb3e6078629d7e':
  Increased the falsing threshold when woken up by touch
 2014-09-26 20:44:12 +00:00
xinhe
5ee3f511f2 am 753044d3: am 53ba6368: Merge "Support multiple SIM/Subscription on telephony registration" into lmp-sprout-dev 
* commit '753044d3d77489417716076443c11a27c90377db':
  Support multiple SIM/Subscription on telephony registration
 2014-09-26 20:43:58 +00:00
Deepanshu Gupta
19471a664b am a7c92eeb: am 7ea2dfa4: am 351b7982: am f0ebe2fa: am f202365e: am 8c61344d: am 528b5862: am 941a8f03: (-s ours) am 0c4893ec: am 2889942f: am bfeeee8e: (-s ours) am ecbe6045: am 6950920f: am 1fce990c: am 04861ed4: am 91043364: am 52be792b: am 27d3b926: Fix error when 
* commit 'a7c92eebe13f20d56298478de36d91b3231bbd5b':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 20:43:54 +00:00
Deepanshu Gupta
0bcc559ba7 am 89110fac: am 3eb32ab6: am 3f86a402: am 2dd837cd: (-s ours) am 416b74fe: am ab5971d8: am 1489862e: am 48d0fd99: (-s ours) am ee41b79c: am 7d23e405: am f1033174: (-s ours) am 93b185e3: am 363f4d4e: am 8bf221bd: Fix error when using list as actionBarNavMode. [DO NOT M 
* commit '89110facce8fd4cef05ffb8bf149f5cff90c9d41':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 20:43:50 +00:00
Deepanshu Gupta
62c14032a8 am 5cf13384: am 8b564008: am 90f23349: am a7045a43: (-s ours) am eb31708e: am 83951615: am 467aea17: am a39b3b25: (-s ours) am 08523e68: am 43214e0c: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit '5cf13384745ca4d8cbec98ce1b5c75006149f0dc':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 20:43:46 +00:00
Justin Koh
ddb4384f12 am c04db461: am ac32ca7e: am c4e233e6: am 1c487938: (-s ours) am 04c6d73f: Revert "DO NOT MERGE Fix race condition between binder deaths" 
* commit 'c04db461a305f35158ea5f3a01b300b9c72ee7af':
  Revert "DO NOT MERGE Fix race condition between binder deaths"
 2014-09-26 20:43:42 +00:00
Craig Mautner
8b63fb4a9f am 4e5de862: am 45919a43: am 0d604359: am 6ae7ea94: (-s ours) am 8828d86e: DO NOT MERGE Fix race condition between binder deaths 
* commit '4e5de8620e7a25a4e424d3e2bbe7f0a05f7cbd5d':
  DO NOT MERGE Fix race condition between binder deaths
 2014-09-26 20:43:38 +00:00
Deepanshu Gupta
37a01e03d0 am 06e681d3: am 55ee2bbb: am 7ef65757: am 9fcacf52: (-s ours) am a6e2f226: am 14ffff15: am c8cbff8b: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit '06e681d3f75b0928b0a813199b69febf54d72ba5':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 20:43:34 +00:00
Deepanshu Gupta
f9cf3dc53e am 40f57783: am dd06bba1: am fdf5fe8f: am ac892f68: (-s ours) am 803a59ca: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit '40f577836a3ba17e8e4186c1f5be335a504b9b35':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 20:43:30 +00:00
Selim Cinek
b32e372ef5 am 8d6d6478: am 7f8acb8f: Merge "Fixed a crash with disapearing views" into lmp-dev 
* commit '8d6d64789ae83a5a8e2ca96196145c9128108c82':
  Fixed a crash with disapearing views
 2014-09-26 19:52:44 +00:00
Kenny Guy
24bea65421 am 420050d8: am 25be3cd6: Merge "Uninstall for all users should check device admins." into lmp-dev 
* commit '420050d8ccfbb21b491aa67d84a771907f28b744':
  Uninstall for all users should check device admins.
 2014-09-26 19:52:40 +00:00
RoboErik
9ea363b0fd am 66bc433a: am cab05d54: Merge "Disable MediaSessionLegacyHelper debugging" into lmp-dev 
* commit '66bc433a10b9742a6b0864abe75bbbed2468a997':
  Disable MediaSessionLegacyHelper debugging
 2014-09-26 19:52:36 +00:00
RoboErik
12cb62f8c2 am 7d111759: am c80873d5: Merge "Remove BT routes when BT is turned off" into lmp-dev 
* commit '7d111759e90abe9ec0e66f4231c252f924f6d7b0':
  Remove BT routes when BT is turned off
 2014-09-26 19:52:31 +00:00
Selim Cinek
fc1bee6c42 am edccb1be: am a9827245: Merge "Increased the falsing threshold when woken up by touch" into lmp-dev 
* commit 'edccb1be4f9a83c80b3117054c16678762c496c5':
  Increased the falsing threshold when woken up by touch
 2014-09-26 19:52:28 +00:00
xinhe
31a5a1c15c am 53ba6368: Merge "Support multiple SIM/Subscription on telephony registration" into lmp-sprout-dev 
* commit '53ba6368fe84513f0cd2726938fbf8838dcf68b3':
  Support multiple SIM/Subscription on telephony registration
 2014-09-26 19:47:02 +00:00
Deepanshu Gupta
190272c2d3 am 7ea2dfa4: am 351b7982: am f0ebe2fa: am f202365e: am 8c61344d: am 528b5862: am 941a8f03: (-s ours) am 0c4893ec: am 2889942f: am bfeeee8e: (-s ours) am ecbe6045: am 6950920f: am 1fce990c: am 04861ed4: am 91043364: am 52be792b: am 27d3b926: Fix error when using list a 
* commit '7ea2dfa45e33fe366a781d7d7d420a926ff62367':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 19:46:59 +00:00
Deepanshu Gupta
d10962dda3 am 3eb32ab6: am 3f86a402: am 2dd837cd: (-s ours) am 416b74fe: am ab5971d8: am 1489862e: am 48d0fd99: (-s ours) am ee41b79c: am 7d23e405: am f1033174: (-s ours) am 93b185e3: am 363f4d4e: am 8bf221bd: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit '3eb32ab6bd660ca95f85d3ccaacd0d700b1224b1':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 19:46:55 +00:00
Deepanshu Gupta
7e664b0b30 am 8b564008: am 90f23349: am a7045a43: (-s ours) am eb31708e: am 83951615: am 467aea17: am a39b3b25: (-s ours) am 08523e68: am 43214e0c: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit '8b56400834887a39a9e8d04f0b21a424a194986f':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 19:46:52 +00:00
Justin Koh
421b4de3fb am ac32ca7e: am c4e233e6: am 1c487938: (-s ours) am 04c6d73f: Revert "DO NOT MERGE Fix race condition between binder deaths" 
* commit 'ac32ca7e0cc54b1b2a46e6fe404a60a61abd86bd':
  Revert "DO NOT MERGE Fix race condition between binder deaths"
 2014-09-26 19:46:49 +00:00
Craig Mautner
fb5d979462 am 45919a43: am 0d604359: am 6ae7ea94: (-s ours) am 8828d86e: DO NOT MERGE Fix race condition between binder deaths 
* commit '45919a431ec2433971b0bb3e118e307f07f6dcf0':
  DO NOT MERGE Fix race condition between binder deaths
 2014-09-26 19:46:45 +00:00
Deepanshu Gupta
340a09688e am 55ee2bbb: am 7ef65757: am 9fcacf52: (-s ours) am a6e2f226: am 14ffff15: am c8cbff8b: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit '55ee2bbb97a35b92d610d12c2c58e6741d831c3e':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 19:46:42 +00:00
Deepanshu Gupta
27c40454dc am dd06bba1: am fdf5fe8f: am ac892f68: (-s ours) am 803a59ca: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit 'dd06bba1a3936cb4a30bf7fc0775a4aa5485c1b9':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 19:46:39 +00:00
Selim Cinek
8f37f2b85d am 7f8acb8f: Merge "Fixed a crash with disapearing views" into lmp-dev 
* commit '7f8acb8f03987a9e9f0f77c3e2500a82f1cee029':
  Fixed a crash with disapearing views
 2014-09-26 19:42:42 +00:00
Kenny Guy
c0ee08d3c4 am 25be3cd6: Merge "Uninstall for all users should check device admins." into lmp-dev 
* commit '25be3cd6719af42c41a6a99eea1034b00f39a825':
  Uninstall for all users should check device admins.
 2014-09-26 19:42:38 +00:00
RoboErik
fd0136e978 am cab05d54: Merge "Disable MediaSessionLegacyHelper debugging" into lmp-dev 
* commit 'cab05d54baa53bc542fa35f33e612f2c41746307':
  Disable MediaSessionLegacyHelper debugging
 2014-09-26 19:42:33 +00:00
RoboErik
d787eae955 am c80873d5: Merge "Remove BT routes when BT is turned off" into lmp-dev 
* commit 'c80873d5fa3976c5f6c238fdc98d67bc22cddb72':
  Remove BT routes when BT is turned off
 2014-09-26 19:42:29 +00:00
Selim Cinek
66eab81ef7 am a9827245: Merge "Increased the falsing threshold when woken up by touch" into lmp-dev 
* commit 'a98272456d72460e010d9b7206f82414b7d5034e':
  Increased the falsing threshold when woken up by touch
 2014-09-26 19:42:26 +00:00
Selim Cinek
7e3bfca8d0 Merge "Fixed a crash with disapearing views" into lmp-dev 2014-09-26 16:50:36 +00:00
xinhe
3d4834f0eb Merge "Support multiple SIM/Subscription on telephony registration" into lmp-sprout-dev 2014-09-26 16:47:04 +00:00
Kenny Guy
a2b48057e1 Merge "Uninstall for all users should check device admins." into lmp-dev 2014-09-26 16:36:43 +00:00
RoboErik
2b731e7b7c Merge "Disable MediaSessionLegacyHelper debugging" into lmp-dev 2014-09-26 16:25:45 +00:00
RoboErik
9b2e567ad4 Merge "Remove BT routes when BT is turned off" into lmp-dev 2014-09-26 16:25:29 +00:00
Deepanshu Gupta
6df37e297d am 351b7982: am f0ebe2fa: am f202365e: am 8c61344d: am 528b5862: am 941a8f03: (-s ours) am 0c4893ec: am 2889942f: am bfeeee8e: (-s ours) am ecbe6045: am 6950920f: am 1fce990c: am 04861ed4: am 91043364: am 52be792b: am 27d3b926: Fix error when using list as actionBarNa 
* commit '351b7982a933e90f5aef6571b1e0581bbc411945':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 16:17:40 +00:00
Deepanshu Gupta
0fc8646cfc am 3f86a402: am 2dd837cd: (-s ours) am 416b74fe: am ab5971d8: am 1489862e: am 48d0fd99: (-s ours) am ee41b79c: am 7d23e405: am f1033174: (-s ours) am 93b185e3: am 363f4d4e: am 8bf221bd: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit '3f86a4028bde53858a82f05ea369cc401bff6284':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 16:17:37 +00:00
Deepanshu Gupta
20ae3641d1 am 90f23349: am a7045a43: (-s ours) am eb31708e: am 83951615: am 467aea17: am a39b3b25: (-s ours) am 08523e68: am 43214e0c: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit '90f23349cd139aedd6e3029f71763d3e0ecde0f8':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 16:17:33 +00:00
Justin Koh
e618331ddf am c4e233e6: am 1c487938: (-s ours) am 04c6d73f: Revert "DO NOT MERGE Fix race condition between binder deaths" 
* commit 'c4e233e660db990b9b7759f274afda88d44bd036':
  Revert "DO NOT MERGE Fix race condition between binder deaths"
 2014-09-26 16:17:29 +00:00
Craig Mautner
1dfa7cb9d2 am 0d604359: am 6ae7ea94: (-s ours) am 8828d86e: DO NOT MERGE Fix race condition between binder deaths 
* commit '0d604359272d89c7e984a9aff978cee89a9954c8':
  DO NOT MERGE Fix race condition between binder deaths
 2014-09-26 16:17:26 +00:00
Deepanshu Gupta
604445b0f8 am 7ef65757: am 9fcacf52: (-s ours) am a6e2f226: am 14ffff15: am c8cbff8b: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit '7ef65757bf3ed611d66f07406d6df83983d791af':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 16:17:23 +00:00
Deepanshu Gupta
6d9b32f954 am fdf5fe8f: am ac892f68: (-s ours) am 803a59ca: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit 'fdf5fe8f1121770839b713be257dbc3cc41613e5':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 16:17:20 +00:00
Selim Cinek
40968da1b7 Merge "Increased the falsing threshold when woken up by touch" into lmp-dev 2014-09-26 16:16:36 +00:00
Yao Chen
83f12a2514 am a4930277: am 000dd0f8: am 86d77815: Merge "Check the return value of bindService, and notify media browser client onConnectionFailed if it returns false." into lmp-dev 
* commit 'a49302777a963dd7dc184e4f1227f8c71ea3879c':
  Check the return value of bindService, and notify media browser client onConnectionFailed if it returns false.
 2014-09-26 16:12:54 +00:00
Philip Nowell
0652f79541 am e4b2bee4: am f8ecaacb: am 571730b4: Merge "Corrects a typo that identified XXXHIGH as 560 dpi instead of 640." into lmp-dev 
* commit 'e4b2bee477566ee142aabc719cb6a77eae812110':
  Corrects a typo that identified XXXHIGH as 560 dpi instead of 640.
 2014-09-26 16:12:50 +00:00
Deepanshu Gupta
743ee98c68 am f0ebe2fa: am f202365e: am 8c61344d: am 528b5862: am 941a8f03: (-s ours) am 0c4893ec: am 2889942f: am bfeeee8e: (-s ours) am ecbe6045: am 6950920f: am 1fce990c: am 04861ed4: am 91043364: am 52be792b: am 27d3b926: Fix error when using list as actionBarNavMode. [DO NO 
* commit 'f0ebe2fa14e71270e6ea159d3734c1ccc2348030':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 16:11:49 +00:00
Deepanshu Gupta
c9b7cb5b9b am 2dd837cd: (-s ours) am 416b74fe: am ab5971d8: am 1489862e: am 48d0fd99: (-s ours) am ee41b79c: am 7d23e405: am f1033174: (-s ours) am 93b185e3: am 363f4d4e: am 8bf221bd: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit '2dd837cdafd8ce6d2c3db7da20b92a74418f41a6':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 16:11:43 +00:00
Deepanshu Gupta
23d43a0cc4 am a7045a43: (-s ours) am eb31708e: am 83951615: am 467aea17: am a39b3b25: (-s ours) am 08523e68: am 43214e0c: Fix error when using list as actionBarNavMode. [DO NOT MERGE] 
* commit 'a7045a43ca83d65134a54236ed0ead7751ee7377':
  Fix error when using list as actionBarNavMode. [DO NOT MERGE]
 2014-09-26 16:11:38 +00:00
Justin Koh
c483a392ce am 1c487938: (-s ours) am 04c6d73f: Revert "DO NOT MERGE Fix race condition between binder deaths" 
* commit '1c487938c45317997389b9ad101fc6739e3fe847':
  Revert "DO NOT MERGE Fix race condition between binder deaths"
 2014-09-26 16:11:33 +00:00