Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
177,605 Commits 3 Branches 0 Tags
38b5d057f08a1a05df44f94de1053f74739c6677
Commit Graph

48524 Commits

Author SHA1 Message Date
Svetoslav
44389c5a3c Merge "Accessibility node provider getting invalid virtual view id." into lmp-dev 2014-09-26 22:56:28 +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
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
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
e14facba6d 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:29:20 +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
Fabrice Di Meglio
558e64b39f 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 21:58:08 +00:00
Dianne Hackborn
c29de2ffb2 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 21:57:49 +00: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
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
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
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
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
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
Dianne Hackborn
8810e902be am cf2b850d: am dd5ebb6a: am 298b3d23: am 45245d61: Merge "Fix issue #17671802: "content" command always prints..." into lmp-dev 
* commit 'cf2b850d851396510b235b556adf96710904548d':
  Fix issue #17671802: "content" command always prints...
 2014-09-26 20:53:25 +00:00
Martijn Coenen
96ea2977fe am 25161ca3: am 22fa2e82: am eaaa5adb: am d846490a: Merge "Add hidden API to disable NFC (optional persist)." into lmp-dev 
* commit '25161ca3a8cfa6210cf917ee7da85e82eec9feff':
  Add hidden API to disable NFC (optional persist).
 2014-09-26 20:52:53 +00:00
Jorim Jaggi
69c0943e43 am 50111539: am 5c75b9a7: am 5299d7e5: am 9b20e012: Merge "Don\'t preload task description icons when opening recents" into lmp-dev 
* commit '5011153937fdb0fbbb7d75e09204370c2aeed00a':
  Don't preload task description icons when opening recents
 2014-09-26 20:52:43 +00:00
Raph Levien
ec017cbbcb am cd66535e: am 8ece858f: am 02366924: am a3e8bd63: Merge "Defer spelling correction with apostrophe" into lmp-dev 
* commit 'cd66535e837e19bf2c6b177f8c1ff34c3446486e':
  Defer spelling correction with apostrophe
 2014-09-26 20:52:33 +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
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
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
Dianne Hackborn
192554b59b Merge "Fix issue #17671802: "content" command always prints..." into lmp-dev 2014-09-26 20:06:02 +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
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
Raph Levien
a4e3a616cd am 02366924: am a3e8bd63: Merge "Defer spelling correction with apostrophe" into lmp-dev 
* commit '02366924dfd8c0ae2c61f87a92c0b6a24a852f29':
  Defer spelling correction with apostrophe
 2014-09-26 19:52:48 +00:00
Martijn Coenen
d1398c5eda am d846490a: Merge "Add hidden API to disable NFC (optional persist)." into lmp-dev 
* commit 'd846490a560122f9dd67d863da9ebddf81e15ba2':
  Add hidden API to disable NFC (optional persist).
 2014-09-26 19:43:58 +00:00
Jorim Jaggi
2ef12e4a5c am 9b20e012: Merge "Don\'t preload task description icons when opening recents" into lmp-dev 
* commit '9b20e0125f1ef129a719834874262574a2a0db9a':
  Don't preload task description icons when opening recents
 2014-09-26 19:43:50 +00:00
Raph Levien
5d8fa6c173 am a3e8bd63: Merge "Defer spelling correction with apostrophe" into lmp-dev 
* commit 'a3e8bd63d0d6640b9073b5617c76e1d890a29fcb':
  Defer spelling correction with apostrophe
 2014-09-26 19:43:41 +00:00
Philip Nowell
3b726758f1 am f1234ed2: am ffb2a1f3: am e4b2bee4: am f8ecaacb: am 571730b4: Merge "Corrects a typo that identified XXXHIGH as 560 dpi instead of 640." into lmp-dev 
* commit 'f1234ed20dcd1f77e5bd2e705f0516306403bc47':
  Corrects a typo that identified XXXHIGH as 560 dpi instead of 640.
 2014-09-26 19:43:21 +00:00
Martijn Coenen
a751e2aa37 am d846490a: Merge "Add hidden API to disable NFC (optional persist)." into lmp-dev 
* commit 'd846490a560122f9dd67d863da9ebddf81e15ba2':
  Add hidden API to disable NFC (optional persist).
 2014-09-26 19:43:03 +00:00
Jorim Jaggi
875db8db40 am 9b20e012: Merge "Don\'t preload task description icons when opening recents" into lmp-dev 
* commit '9b20e0125f1ef129a719834874262574a2a0db9a':
  Don't preload task description icons when opening recents
 2014-09-26 19:42:55 +00:00
Raph Levien
e430e9bba6 am a3e8bd63: Merge "Defer spelling correction with apostrophe" into lmp-dev 
* commit 'a3e8bd63d0d6640b9073b5617c76e1d890a29fcb':
  Defer spelling correction with apostrophe
 2014-09-26 19:42:46 +00:00
Dianne Hackborn
2f1993ec46 Fix issue #17671802: "content" command always prints... 
..."uid 2000 does not have android.permission.UPDATE_DEVICE_STATS"

Make sure to clear calling identity before getting into the guts
of the activity manager.  Also fix the places the activity manager
calls in to battery stats to not require a permission check, anyway.

Change-Id: Ifd90937875b9fe0c36aa3f5cf1ec173746914e6b
 2014-09-26 11:28:01 -07:00
Martijn Coenen
0a094c61bc Merge "Add hidden API to disable NFC (optional persist)." into lmp-dev 2014-09-26 18:08:31 +00:00
Jorim Jaggi
e51b21a81e Merge "Don't preload task description icons when opening recents" into lmp-dev 2014-09-26 17:57:05 +00:00
Raph Levien
c8ffeeca67 Merge "Defer spelling correction with apostrophe" into lmp-dev 2014-09-26 17:12:49 +00:00
Jorim Jaggi
bdd4b201e4 Don't preload task description icons when opening recents 
Bug: 17624331
Change-Id: I55a1184efd5982122f87fab99a5402336b380d7c
 2014-09-26 19:00:05 +02:00
Philip Nowell
5fec1ec61b am ffb2a1f3: am e4b2bee4: am f8ecaacb: am 571730b4: Merge "Corrects a typo that identified XXXHIGH as 560 dpi instead of 640." into lmp-dev 
* commit 'ffb2a1f3ae9b1942ac5c8164534b2e18bda68afc':
  Corrects a typo that identified XXXHIGH as 560 dpi instead of 640.
 2014-09-26 16:17:10 +00:00
Philip Nowell
6575738251 am f8ecaacb: am 571730b4: Merge "Corrects a typo that identified XXXHIGH as 560 dpi instead of 640." into lmp-dev 
* commit 'f8ecaacbfd77cdb0b2aa1fb0918243691415c86e':
  Corrects a typo that identified XXXHIGH as 560 dpi instead of 640.
 2014-09-26 16:06:57 +00:00
Raph Levien
b1fef1114e Defer spelling correction with apostrophe 
When typing a contraction (such as "doesn't") we don't want a spell
right after the apostrophe, as this will create a false temporary red
underline, and the span split also breaks a kern pair causing text to
shift. This patch detects the case where the cursor is immediately after
such a word and suppresses correction in that case.

Bug: 17641350

Change-Id: I4d09576a31df551c96f820242fd2cbc675506dae
 2014-09-26 08:59:28 -07:00
Przemyslaw Szczepaniak
f0619add9e am a2722441: am 32c73663: am e8b3a391: am 8924617d: am f0a7c767: Merge "Fix ambiguous TTS#playSilence method." into lmp-dev 
* commit 'a2722441c06902f7a9781b1928a6c5952b196da6':
  Fix ambiguous TTS#playSilence method.
 2014-09-26 15:29:22 +00:00
Svetoslav
9ba4f67663 am 1d64c0c9: am c9a230f4: am bcc4f1bc: am b14c7e04: am 9ec435dc: Merge "Using wrong virtual view id When prefetching accessibility nodes." into lmp-dev 
* commit '1d64c0c98f23a7aff70cc5b388fdcc638abbf3e4':
  Using wrong virtual view id When prefetching accessibility nodes.
 2014-09-26 15:28:55 +00:00
Dianne Hackborn
b0e58ff6b3 am 534556ae: am 6b9b8a03: am 27429ba1: am 24ecbc4f: am 0b1eb9d4: Merge "Work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev 
* commit '534556aef5ae22d522c5988d535b3b19b3742fd3':
  Work on issue #17656716: Unhandled exception in Window Manager
 2014-09-26 15:28:28 +00:00