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

153818 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alan Viverette
dfb0b303de am a6958574: am 63756956: Merge "Add callback to track and thumb drawables, propagate state in ASLD" into lmp-dev 
* commit 'a69585749e38e5300162317e4f046dc66cdf1966':
  Add callback to track and thumb drawables, propagate state in ASLD
 2014-09-26 23:24:30 +00:00
Dianne Hackborn
08cb4ec7a7 am 72bc7651: am cbb94a27: Merge "More debugging for issue #17656716: Unhandled exception in Window Manager" into lmp-dev 
* commit '72bc7651fb7b7fff7e3a0a4d0d61cada28278b2d':
  More debugging for issue #17656716: Unhandled exception in Window Manager
 2014-09-26 23:20:26 +00:00
Alan Viverette
72f1d94fed am 63756956: Merge "Add callback to track and thumb drawables, propagate state in ASLD" into lmp-dev 
* commit '637569566d2234b06e08d94acf4db1b0d3be6501':
  Add callback to track and thumb drawables, propagate state in ASLD
 2014-09-26 23:19:12 +00:00
Dianne Hackborn
e4f529c7ba am cbb94a27: Merge "More debugging for issue #17656716: Unhandled exception in Window Manager" into lmp-dev 
* commit 'cbb94a27c1f0fa8c2b459ffe3206eb96006f92dc':
  More debugging for issue #17656716: Unhandled exception in Window Manager
 2014-09-26 23:15:04 +00:00
Alan Viverette
ab9f1bab6b Merge "Add callback to track and thumb drawables, propagate state in ASLD" into lmp-dev 2014-09-26 23:13:55 +00:00
Alan Viverette
b067405bf4 Add callback to track and thumb drawables, propagate state in ASLD 
BUG: 17665424
Change-Id: I22da4530f3e2869d856102e804f020461a46fe49
 2014-09-26 16:12:16 -07:00
Dianne Hackborn
820eab3e75 Merge "More debugging for issue #17656716: Unhandled exception in Window Manager" into lmp-dev 2014-09-26 23:11:40 +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
Marco Nelissen
5f411696a6 Validate MTP path 
Bug: 17673184
Change-Id: I51a64f065d9b3609557af81e596ebeb8720ab6c5
 2014-09-26 16:07:49 -07: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
Xia Ying
b82dc3d637 Handling service number convert while roaming. 
When roaming in GSM/UMTS and internal CDMA network,
(1)change VZW custumer service numeber *611 to +19085594899.
(2)change VZW voice mail number *86 to +1MDN.

Change-Id: Id2bb10d119a1b196538a0e09f5c1f7c4b3f2b890
 2014-09-26 15:58:49 -07: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
Dianne Hackborn
fad079dc5d More debugging for issue #17656716: Unhandled exception in Window Manager 
Change-Id: I81d3678e21d293d5896c467ae5c6739c82cfaa95
 2014-09-26 15:46:24 -07:00
Eino-Ville Talvala
56fbbeab79 Camera2: Fix parallel session and device close() exception 
It's possible for the device to have close() called on it
during the session close sequence such that the session still
tries to do a stream reconfiguration on the closed device.

Handle the exception thrown by this attempt.

Bug: 17661765

Change-Id: Iee63c5c559405abe5c044ae251ad56edd1fb3e79
 2014-09-26 15:37:26 -07: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
Justin Koh
267874622e DO NOT MERGE Disable vibration from notificationmanagerservice when on watch 
This is a hack for this version: in a future framework version, there is an API
to do this.

Bug: 17646502
Change-Id: I7b46c0894c5a21189eb82efa04f2ce50ef1f927c
 2014-09-26 22:23:33 +00: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
a552e9846a am a2a5c97f: am 8420a924: Merge "Fix bug #17521147 Settings activity looks terrible on Volantis" into lmp-dev 
* commit 'a2a5c97fe32f60a7b62899d23feb5392f11406b4':
  Fix bug #17521147 Settings activity looks terrible on Volantis
 2014-09-26 21:01:47 +00:00
Fabrice Di Meglio
c410968871 am 8420a924: Merge "Fix bug #17521147 Settings activity looks terrible on Volantis" into lmp-dev 
* commit '8420a924e038948e5df6ab41b4fbc73ae16c67b4':
  Fix bug #17521147 Settings activity looks terrible on Volantis
 2014-09-26 20:56:54 +00:00
Fabrice Di Meglio
6b0a880e13 Merge "Fix bug #17521147 Settings activity looks terrible on Volantis" into lmp-dev 2014-09-26 20:52:02 +00:00
Fabrice Di Meglio
b22be6fcf2 Fix bug #17521147 Settings activity looks terrible on Volantis 
- update layouts for PreferenceActivity and its headers
in two panes mode (per UX request)
- add theming where it was missing

Change-Id: I0c478c1a66b6de7e122b7ee73da24f3dd5a7bc28
 2014-09-26 13:38:12 -07:00
Ricardo Cervera
b9c000e090 docs: Fixed path for build output. 
http://b.android.com/76374

Change-Id: I950174eba961e2bf31600671e438e2b85176a9d4
 2014-09-26 13:25:02 -07:00
John Spurlock
f675e2e4be am 996a77ea: am 055abed6: Merge "Avoid dozing in car mode." into lmp-dev 
* commit '996a77eaf6d028e1482c10dd0e3b5ef5126ce320':
  Avoid dozing in car mode.
 2014-09-26 20:20:50 +00:00
John Spurlock
3b366bc3bc am 055abed6: Merge "Avoid dozing in car mode." into lmp-dev 
* commit '055abed6776d56b84f683a3e9b91a92ed23208d5':
  Avoid dozing in car mode.
 2014-09-26 20:16:07 +00:00
Dianne Hackborn
5e2285527d am 298b3d23: am 45245d61: Merge "Fix issue #17671802: "content" command always prints..." into lmp-dev 
* commit '298b3d23d22e9a503eee856fe318b44536737e3b':
  Fix issue #17671802: "content" command always prints...
 2014-09-26 20:11:52 +00:00
John Spurlock
a612aa877e am 6aefa9c2: am f60d0032: Merge "Touch-exploration improvements to volume dialog." into lmp-dev 
* commit '6aefa9c21bec750583650f74d5ef31a5902adde9':
  Touch-exploration improvements to volume dialog.
 2014-09-26 20:11:48 +00:00
John Spurlock
245bd4ec8a Merge "Avoid dozing in car mode." into lmp-dev 2014-09-26 20:09:58 +00:00
Dianne Hackborn
f051b703db am 45245d61: Merge "Fix issue #17671802: "content" command always prints..." into lmp-dev 
* commit '45245d6117ae484bb84d9afa3fbda36d59886059':
  Fix issue #17671802: "content" command always prints...
 2014-09-26 20:07:46 +00:00
John Spurlock
a6e9e79a1f am f60d0032: Merge "Touch-exploration improvements to volume dialog." into lmp-dev 
* commit 'f60d00328c2bd3b34aaaaadf157621e874d6c664':
  Touch-exploration improvements to volume dialog.
 2014-09-26 20:07:42 +00:00
Kevin Ma
cd6facc0a1 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 'a782cd6822bb076460bd02811584b468e626b01d':
  Revert "Revert "DO NOT MERGE Fix race condition between binder deaths""
 2014-09-26 20:07:15 +00:00
Dianne Hackborn
192554b59b Merge "Fix issue #17671802: "content" command always prints..." into lmp-dev 2014-09-26 20:06:02 +00:00
Kevin Ma
7119aec1c6 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 '666f2a918e9cca6f0e219d0abb7ac250953f9f24':
  Revert "Revert "DO NOT MERGE Fix race condition between binder deaths""
 2014-09-26 20:00:16 +00:00
John Spurlock
bd721cafc4 Merge "Touch-exploration improvements to volume dialog." into lmp-dev 2014-09-26 19:58:45 +00:00
Dave Burke
f0e47946a8 am d84ab8b1: am e09e20ee: Merge "Revert "Fix memory leak where we close the descriptor instead of the file."" into lmp-dev 
* commit 'd84ab8b128157d60bc1d4dad6f6223e1f174e188':
  Revert "Fix memory leak where we close the descriptor instead of the file."
 2014-09-26 19:53:18 +00:00
Dan Sandler
19f68fb871 am 8d1b0035: am 7b7ef437: Merge "Don\'t start the keyguard until boot is done." into lmp-dev 
* commit '8d1b0035aa8fd147f0f6841cfac1c48158b78c9e':
  Don't start the keyguard until boot is done.
 2014-09-26 19:53:14 +00:00
Alan Viverette
9584232706 am a53b5408: am 81e2f789: Merge "Fixed mutate() for RippleDrawable, ASLD, AVD, fix applyTheme in VD" into lmp-dev 
* commit 'a53b54087ecfde6fcadcf8632f7dd3ad7c339e2e':
  Fixed mutate() for RippleDrawable, ASLD, AVD, fix applyTheme in VD
 2014-09-26 19:53:11 +00:00
Michael Wright
4a1d3d9a4d am b0ce3099: am ff0384fa: Merge "Turn the device on if the camera lens is uncovered." into lmp-dev 
* commit 'b0ce3099bb0d2c48ac66eb265572dfe454b4dcdb':
  Turn the device on if the camera lens is uncovered.
 2014-09-26 19:53:07 +00:00
Martijn Coenen
e20f9aa316 am eaaa5adb: am d846490a: Merge "Add hidden API to disable NFC (optional persist)." into lmp-dev 
* commit 'eaaa5adb4e553ca2482eb57084d077e8847ffc3e':
  Add hidden API to disable NFC (optional persist).
 2014-09-26 19:53:03 +00:00
Paul Lawrence
ac28e40aa9 am 1623fd7d: am 3f105532: Merge "Don\'t set dev.bootcomplete until interacting with user" into lmp-dev 
* commit '1623fd7d3075c6239d1245abfc9ca3696c1fad6c':
  Don't set dev.bootcomplete until interacting with user
 2014-09-26 19:52:59 +00:00
Jorim Jaggi
b56ec7fc26 am 5299d7e5: am 9b20e012: Merge "Don\'t preload task description icons when opening recents" into lmp-dev 
* commit '5299d7e5e88b0c2b91e9f8bac35b21487ac83d0f':
  Don't preload task description icons when opening recents
 2014-09-26 19:52:56 +00:00