Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
164,787 Commits 3 Branches 0 Tags
4bf1fd39ea0910f09d601008f4cdcbd966573dd9
Commit Graph

164787 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Svetoslav
4bf1fd39ea am bd8db7b1: am daeee005: am 16f3a714: am 5cdfd3ac: am 7c20fcc8: Merge "Accessibility node provider getting invalid virtual view id." into lmp-dev 
* commit 'bd8db7b1026542a7b53845b59ef302c95f4c6c24':
  Accessibility node provider getting invalid virtual view id.
 2014-09-29 19:46:17 +00:00
RoboErik
95cf034365 am 66aec18a: am e825d695: am 3a85b618: am 065b605c: am 55ecb483: Merge "Don\'t forward media keys to the app if the phone session is active" into lmp-dev 
* commit '66aec18ad3ce02f13ad162f3c0edd73f648a316c':
  Don't forward media keys to the app if the phone session is active
 2014-09-29 19:46:10 +00:00
Elliott Hughes
b6af870bcd am 5d8bcd28: am 737b8cd2: am 7d614689: am 416de7fd: am 70c1f083: Merge "Set the system locale correctly even on an encrypted device." into lmp-dev 
* commit '5d8bcd285d190de924a47c39155530038799d148':
  Set the system locale correctly even on an encrypted device.
 2014-09-29 19:46:02 +00:00
Igor Murashkin
800d08591d am d1b710bc: am 04f07d28: am 2a555d0a: am d3edd1c2: am ba164dfb: Merge "camera2: Fix race conditions and deadlocks around configuration" into lmp-dev 
* commit 'd1b710bc82922c266836ecae42d7089e2b55caa7':
  camera2: Fix race conditions and deadlocks around configuration
 2014-09-29 19:45:41 +00:00
Fabrice Di Meglio
507aeb0972 am 1acd81fb: am 33512668: am 5861b628: am a2a5c97f: am 8420a924: Merge "Fix bug #17521147 Settings activity looks terrible on Volantis" into lmp-dev 
* commit '1acd81fbcc980ef17711a3472b7f0d0e3d5e34c4':
  Fix bug #17521147 Settings activity looks terrible on Volantis
 2014-09-29 19:45:33 +00:00
Vinit Deshpande
85316d155b Merge "User wifi separation feature." 2014-09-27 02:06:53 +00:00
Vinit Deshpande
796f1b3633 Merge "Separate wifi AP added by applications. -Add field for tracking user approval of application added networks. -Add WifiConfig fields for creating/updating application name -Add permission to allow system apps to modify any network" 2014-09-27 01:57:33 +00:00
Sky Faber
c55cd10370 User wifi separation feature. 
Change-Id: Iab79db10107ab5dbeb469c12621a9a4916bd62c9
 2014-09-26 18:32:16 -07:00
Svetoslav
bd8db7b102 am daeee005: am 16f3a714: am 5cdfd3ac: am 7c20fcc8: Merge "Accessibility node provider getting invalid virtual view id." into lmp-dev 
* commit 'daeee0053554a7ce81e1586e52521d4ca13bbc94':
  Accessibility node provider getting invalid virtual view id.
 2014-09-26 23:18:06 +00:00
RoboErik
66aec18ad3 am e825d695: am 3a85b618: am 065b605c: am 55ecb483: Merge "Don\'t forward media keys to the app if the phone session is active" into lmp-dev 
* commit 'e825d6958821a4d63c2e7db39c1c02b4300dd1c8':
  Don't forward media keys to the app if the phone session is active
 2014-09-26 23:13:54 +00:00
Elliott Hughes
5d8bcd285d am 737b8cd2: am 7d614689: am 416de7fd: am 70c1f083: Merge "Set the system locale correctly even on an encrypted device." into lmp-dev 
* commit '737b8cd29ccc9799f8a309ca33c0ba4f4c0016d4':
  Set the system locale correctly even on an encrypted device.
 2014-09-26 23:13:49 +00:00
Svetoslav
7755737523 am 16f3a714: am 5cdfd3ac: am 7c20fcc8: Merge "Accessibility node provider getting invalid virtual view id." into lmp-dev 
* commit '16f3a7143e835464393bc21906ebec5e78ffd4d0':
  Accessibility node provider getting invalid virtual view id.
 2014-09-26 23:12:41 +00:00
RoboErik
7412965a54 am 3a85b618: am 065b605c: am 55ecb483: Merge "Don\'t forward media keys to the app if the phone session is active" into lmp-dev 
* commit '3a85b6187dc6d0000f2d0efe0077b18ea83d696e':
  Don't forward media keys to the app if the phone session is active
 2014-09-26 23:08:24 +00:00
Elliott Hughes
4c5965b0eb am 7d614689: am 416de7fd: am 70c1f083: Merge "Set the system locale correctly even on an encrypted device." into lmp-dev 
* commit '7d614689b2b7228c6d5fec97928c9068e412f733':
  Set the system locale correctly even on an encrypted device.
 2014-09-26 23:08:20 +00:00
Svetoslav
78efd1be8c am 5cdfd3ac: am 7c20fcc8: Merge "Accessibility node provider getting invalid virtual view id." into lmp-dev 
* commit '5cdfd3ac79d5e2bf23652a6fb52f95f1267ee9fe':
  Accessibility node provider getting invalid virtual view id.
 2014-09-26 23:08:13 +00:00
RoboErik
bee89155e3 am 065b605c: am 55ecb483: Merge "Don\'t forward media keys to the app if the phone session is active" into lmp-dev 
* commit '065b605c02e52d76dcd1df211b64f94fc4a18604':
  Don't forward media keys to the app if the phone session is active
 2014-09-26 23:03:51 +00:00
Elliott Hughes
3f1c8a08c1 am 416de7fd: am 70c1f083: Merge "Set the system locale correctly even on an encrypted device." into lmp-dev 
* commit '416de7fdbecc186c01db7266c659a0c7ad095eb6':
  Set the system locale correctly even on an encrypted device.
 2014-09-26 23:03:47 +00:00
Svetoslav
9743acd8b5 am 7c20fcc8: Merge "Accessibility node provider getting invalid virtual view id." into lmp-dev 
* commit '7c20fcc83a5216a993bb1b31ab9ed09e90457fc5':
  Accessibility node provider getting invalid virtual view id.
 2014-09-26 23:02:47 +00:00
RoboErik
507cee74c0 am 55ecb483: Merge "Don\'t forward media keys to the app if the phone session is active" into lmp-dev 
* commit '55ecb483ba3afdc46eb4bec5daea4e56a195df22':
  Don't forward media keys to the app if the phone session is active
 2014-09-26 22:58:32 +00:00
Elliott Hughes
2d895e5b21 am 70c1f083: Merge "Set the system locale correctly even on an encrypted device." into lmp-dev 
* commit '70c1f083332729a586d670af7565732a2eb06ab4':
  Set the system locale correctly even on an encrypted device.
 2014-09-26 22:58:28 +00:00
Svetoslav
44389c5a3c Merge "Accessibility node provider getting invalid virtual view id." into lmp-dev 2014-09-26 22:56:28 +00:00
RoboErik
e3c3de677c Merge "Don't forward media keys to the app if the phone session is active" into lmp-dev 2014-09-26 22:52:40 +00:00
Elliott Hughes
39aa0d946b Merge "Set the system locale correctly even on an encrypted device." into lmp-dev 2014-09-26 22:52:31 +00:00
Igor Murashkin
d1b710bc82 am 04f07d28: am 2a555d0a: am d3edd1c2: am ba164dfb: Merge "camera2: Fix race conditions and deadlocks around configuration" into lmp-dev 
* commit '04f07d2808c260db92324fe21338085a4dd9452a':
  camera2: Fix race conditions and deadlocks around configuration
 2014-09-26 22:41:15 +00:00
Igor Murashkin
c8636b3c7b am 2a555d0a: am d3edd1c2: am ba164dfb: Merge "camera2: Fix race conditions and deadlocks around configuration" into lmp-dev 
* commit '2a555d0a99f0eb02d7c25dbdb5797c081b86724d':
  camera2: Fix race conditions and deadlocks around configuration
 2014-09-26 22:36:23 +00:00
Igor Murashkin
67e4da3f64 am d3edd1c2: am ba164dfb: Merge "camera2: Fix race conditions and deadlocks around configuration" into lmp-dev 
* commit 'd3edd1c2f2c6c4c78d515a8f70273b9bc7f27e68':
  camera2: Fix race conditions and deadlocks around configuration
 2014-09-26 22:31:18 +00:00
Igor Murashkin
e014f23e92 am ba164dfb: Merge "camera2: Fix race conditions and deadlocks around configuration" into lmp-dev 
* commit 'ba164dfbcab8d1358075e18199b3ef55f85c8b88':
  camera2: Fix race conditions and deadlocks around configuration
 2014-09-26 22:26:00 +00:00
Svetoslav
b3ba1d4e71 Accessibility node provider getting invalid virtual view id. 
If the virtual child id is not specified we should ask the node
provider to create a node info for the hosting view bu passing
the special host node id.

bug:17664111

Change-Id: I9c2d3195ad813eed7ea4108fe0d7ccb9cc32a1a0
 2014-09-26 15:23:36 -07:00
Igor Murashkin
381d22f706 Merge "camera2: Fix race conditions and deadlocks around configuration" into lmp-dev 2014-09-26 22:20:12 +00:00
Elliott Hughes
f839b4fcb6 Set the system locale correctly even on an encrypted device. 
Bug: 17659622
Change-Id: Ibbbd5b959bfab5345f20b556c4720d0910b50084
 2014-09-26 15:18:20 -07:00
RoboErik
de9ba39c17 Don't forward media keys to the app if the phone session is active 
This checks if the phone app is currently getting or in a call when a
media key event is sent and sends it to the phone session instead of the
foreground app if it is.

bug:17527302
Change-Id: Ie5d6cf0c897da81d106f2b1a0561b79f4fc35e82
 2014-09-26 14:53:06 -07:00
Fabrice Di Meglio
1acd81fbcc am 33512668: am 5861b628: am a2a5c97f: am 8420a924: Merge "Fix bug #17521147 Settings activity looks terrible on Volantis" into lmp-dev 
* commit '33512668429e480f0c80b3e60adae43230065184':
  Fix bug #17521147 Settings activity looks terrible on Volantis
 2014-09-26 21:53:00 +00:00
Fabrice Di Meglio
8bb331f2b3 am 5861b628: am a2a5c97f: am 8420a924: Merge "Fix bug #17521147 Settings activity looks terrible on Volantis" into lmp-dev 
* commit '5861b628feb17c5e81a4e8725e13504a6198886b':
  Fix bug #17521147 Settings activity looks terrible on Volantis
 2014-09-26 21:07:43 +00:00
John Spurlock
c71d05d133 am c8fe601f: am caaf26e6: am 0408042f: am 996a77ea: am 055abed6: Merge "Avoid dozing in car mode." into lmp-dev 
* commit 'c8fe601f2431d0742c413721bbb1298a803af26f':
  Avoid dozing in car mode.
 2014-09-26 21:04:47 +00:00
Dianne Hackborn
dd5d208856 am a3ae140a: am cf2b850d: am dd5ebb6a: am 298b3d23: am 45245d61: Merge "Fix issue #17671802: "content" command always prints..." into lmp-dev 
* commit 'a3ae140afb6044adb904b35994a48dc2395bf7dd':
  Fix issue #17671802: "content" command always prints...
 2014-09-26 21:04:42 +00:00
John Spurlock
109a4f60bc am 2e565ae3: am 4286c0e3: am 9067c980: am 6aefa9c2: am f60d0032: Merge "Touch-exploration improvements to volume dialog." into lmp-dev 
* commit '2e565ae340f4490f3fe389d2ce8576fd96161483':
  Touch-exploration improvements to volume dialog.
 2014-09-26 21:04:37 +00:00
Kevin Ma
07ae0ea952 am 26239b22: (-s ours) am af401626: am ee44c7da: am a782cd68: am 666f2a91: am 938ff081: (-s ours) am 18037f14: Merge "Revert "Revert "DO NOT MERGE Fix race condition between binder deaths""" into klp-modular-dev 
* commit '26239b22b68cdeebf39407c8d3a75b0786d4f3b7':
  Revert "Revert "DO NOT MERGE Fix race condition between binder deaths""
 2014-09-26 21:04:32 +00:00
Dave Burke
0ef554e7c7 am fd48718b: am c81f70b6: am 716bae33: am d84ab8b1: am e09e20ee: Merge "Revert "Fix memory leak where we close the descriptor instead of the file."" into lmp-dev 
* commit 'fd48718bdae13cf14cb57ec8d7822dbe50daae0d':
  Revert "Fix memory leak where we close the descriptor instead of the file."
 2014-09-26 21:04:27 +00:00
Dan Sandler
ce4557004a am 6f82c861: am d1cc88aa: am fa3b777d: am 8d1b0035: am 7b7ef437: Merge "Don\'t start the keyguard until boot is done." into lmp-dev 
* commit '6f82c86111927dcff1f5090a48d31c06465cd5c0':
  Don't start the keyguard until boot is done.
 2014-09-26 21:04:21 +00:00
Alan Viverette
d2fc7336ba am 2225bc63: am 5c7ca487: am 5ad708bb: am a53b5408: am 81e2f789: Merge "Fixed mutate() for RippleDrawable, ASLD, AVD, fix applyTheme in VD" into lmp-dev 
* commit '2225bc6339968807cd971deacd023f77cce53e84':
  Fixed mutate() for RippleDrawable, ASLD, AVD, fix applyTheme in VD
 2014-09-26 21:04:16 +00:00
Michael Wright
0cb9f0780e am 45a3941c: am e4deffcd: am 0dc10d6d: am b0ce3099: am ff0384fa: Merge "Turn the device on if the camera lens is uncovered." into lmp-dev 
* commit '45a3941c4be73d54c5270f3435fa79fdf262665c':
  Turn the device on if the camera lens is uncovered.
 2014-09-26 21:04:11 +00:00
Martijn Coenen
f69c8a7ed6 am 931b106e: am 25161ca3: am 22fa2e82: am eaaa5adb: am d846490a: Merge "Add hidden API to disable NFC (optional persist)." into lmp-dev 
* commit '931b106e78c2ddec4f750075857a1153819d3c08':
  Add hidden API to disable NFC (optional persist).
 2014-09-26 21:04:06 +00:00
Paul Lawrence
9f93b9077a am 6a062267: am ba554c7d: am 7a00a8f5: am 1623fd7d: am 3f105532: Merge "Don\'t set dev.bootcomplete until interacting with user" into lmp-dev 
* commit '6a062267aac65a45a6d975a819d938fa5d01fd34':
  Don't set dev.bootcomplete until interacting with user
 2014-09-26 21:04:00 +00:00
Jorim Jaggi
9984c1b45c am eddc4b18: am 50111539: am 5c75b9a7: am 5299d7e5: am 9b20e012: Merge "Don\'t preload task description icons when opening recents" into lmp-dev 
* commit 'eddc4b18899498c3cf6d535c79020e030f7f7eb6':
  Don't preload task description icons when opening recents
 2014-09-26 21:03:56 +00:00
Selim Cinek
8d0fbf0385 am 5bd754e4: am d21c44ae: am 1a13fcb0: am 144341e8: am 9583b5a9: Merge "Fixed a bug where the QS could get stuck" into lmp-dev 
* commit '5bd754e4ab336ed943d38f726aadc7792bf27b1f':
  Fixed a bug where the QS could get stuck
 2014-09-26 21:03:51 +00:00
Raph Levien
de61fe05bd am e63943cd: am cd66535e: am 8ece858f: am 02366924: am a3e8bd63: Merge "Defer spelling correction with apostrophe" into lmp-dev 
* commit 'e63943cdb556354603166ce20a286f26c2e25a46':
  Defer spelling correction with apostrophe
 2014-09-26 21:03:32 +00:00
Selim Cinek
f741126006 am b7f9f2d0: am 409d6ce3: am ceeac743: am 8d6d6478: am 7f8acb8f: Merge "Fixed a crash with disapearing views" into lmp-dev 
* commit 'b7f9f2d0e4efcdc348c68aee286f1d35bc487c01':
  Fixed a crash with disapearing views
 2014-09-26 21:03:27 +00:00
Kenny Guy
28aac63a8f am 5e04b52d: am e938f314: am c322e272: am 420050d8: am 25be3cd6: Merge "Uninstall for all users should check device admins." into lmp-dev 
* commit '5e04b52d87dba1abfe1f274f0a32179490c2c813':
  Uninstall for all users should check device admins.
 2014-09-26 21:03:22 +00:00
RoboErik
7cf4a1e689 am 594858c9: am 765ef814: am 5120438b: am 66bc433a: am cab05d54: Merge "Disable MediaSessionLegacyHelper debugging" into lmp-dev 
* commit '594858c9d5b7c93bb0c70928c27fb4381fcb0226':
  Disable MediaSessionLegacyHelper debugging
 2014-09-26 21:03:17 +00:00
RoboErik
92c622ef82 am 22069b65: am 3c99bd4b: am 298314cb: am 7d111759: am c80873d5: Merge "Remove BT routes when BT is turned off" into lmp-dev 
* commit '22069b6592c821487fc024b59e103c39fa4bbd34':
  Remove BT routes when BT is turned off
 2014-09-26 21:03:12 +00:00