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

160227 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Lesinski
978ab9d929 AAPT: Fix issue with synthesized resource not actually showing up 
AAPT keeps around a few pieces of state that are disjoint, so
simply adding to a collection won't add the resource to the final
flattened output. Instead, we create the resource from the top
and then copy over the values into the newly created resource.

Bug:17647890
Change-Id: I214263e84c18f9370c6e6a5aa53aa2d833fc842d
 2014-09-24 19:02:52 -07:00
Svetoslav
8aeb091294 Accessibility events may be fired even if no services observe them. 
If all accessibility services are disabled we turn off event firing
to avoid a lot of work for nothing. The logic to do that had a flaw
and was not turning event firing off in every case it should. We were
tuning event firing if it is on and no service is enabled but it
is possible that a package on the system image is disabled so the
service is enabled just not bound. Arguably we can remove the
serivice from the enabled list but it is technically on the device.
Note that we correctly handle the case of a package being removed.

bug:17332506

Change-Id: I6d6d9cb9cc271116a3d22ed9fd8d7f533dec9a0b
 2014-09-24 17:55:53 -07:00
Alan Viverette
98a514221a Fix "Always apply window insets to action modes" 
BUG: 17628875
Change-Id: I03bf6cfd68d0ca2904b43e00f68d07d497ff9879
 2014-09-24 17:55:52 -07:00
Amith Yamasani
84949f5c4b Fix GPS icon not showing for secondary users 
Watch for high power usage broadcasts from all users in the statusbar.

Bug: 17647654
Change-Id: I2c6c5a218d38438415a450cfa2f9328763af3f50
 2014-09-24 17:46:19 -07:00
Ronghua Wu
7e1d525b47 Merge "MediaCodecList: fix findEncoderForFormat." into lmp-dev 2014-09-25 00:23:03 +00:00
Sukanya Rajkhowa
db96682537 Add config to control phone switch 
When UNSOL_RADIO_TECH_CHANGED is received, PhoneProxy
calls updatePhoneObject to decide whether to do a phone
switch. This config determines whether to also do a
phone switch when VOICE_REGISTRATION_STATE changes. Default
value is true

Bug: 17394282
Change-Id: Iae6c35992b932923d74c405d443b1e7e98f750c8
 2014-09-25 00:20:52 +00:00
Lajos Molnar
17ffc40362 Merge "MediaCodec: revalidate cached queued input buffers if queue fails (2)" into lmp-dev 2014-09-25 00:19:44 +00:00
Ronghua Wu
e19a80def2 MediaCodecList: fix findEncoderForFormat. 
Bug: 17460057
Bug: 17637188
Change-Id: I618ff1a4dbbecf64786207ccb5208b0a67d80ddd
 2014-09-25 00:17:15 +00:00
Andre Eisenbach
77e7054176 Merge "Remove remanents of onConnectionCongested in framwork" into lmp-dev 2014-09-24 23:57:02 +00:00
Vinit Deshpande
7486328d6c Merge "Introduce config setting for scanning mac OUI" into lmp-dev 2014-09-24 23:50:05 +00:00
Lajos Molnar
b15ed6337c MediaCodec: revalidate cached queued input buffers if queue fails (2) 
Handle the other ways queueBuffer can fail.  Revalidate the buffers
properly, e.g. without clearing them.

Bug: 17630446
Change-Id: I22e0e89c2835eb6a461046a8cf3be03635088302
 2014-09-24 16:44:47 -07:00
Lajos Molnar
7e28fc7370 Merge "MediaCodec: revalidate cached queued input buffers if queue fails" into lmp-dev 2014-09-24 23:40:56 +00:00
Jeff Sharkey
0a285b4462 Merge "Include reason when wiping data." into lmp-dev 2014-09-24 23:27:25 +00:00
ztenghui
9d23862bfd Merge "Add one more test and update old tests" into lmp-dev 2014-09-24 23:07:35 +00:00
ztenghui
dde353394c Merge "Fix AVD for CTS failure." into lmp-dev 2014-09-24 23:07:18 +00:00
RoboErik
68d6478e6a am 3f872752: am e73770ce: am 0cbc26db: am 2a638f08: Merge "Clear the volume cache for all inactive state transitions" into lmp-dev 
* commit '3f87275212b04b1c7aed91a81a92315b0791a235':
  Clear the volume cache for all inactive state transitions
 2014-09-24 22:54:38 +00:00
Amith Yamasani
6ea243e87e am bc1ec524: am 57924e40: am de208628: am eb5fb023: Merge "Return masked location mode for managed profiles" into lmp-dev 
* commit 'bc1ec524ec5b91864547fb06af2132145b296c0a':
  Return masked location mode for managed profiles
 2014-09-24 22:54:33 +00:00
Dianne Hackborn
f4d6e2482a am e8fd0cf9: am a5fd257a: am 98b7584e: am 2a857c63: Merge "Work on issue #17624121: Settings crash while launching on wiped device" into lmp-dev 
* commit 'e8fd0cf9afa97eba8e9009b77ab1fe6d49aed02d':
  Work on issue #17624121: Settings crash while launching on wiped device
 2014-09-24 22:54:29 +00:00
Igor Murashkin
41882cd269 am c819ec1b: am e6339fe4: am ee0b9782: am 7ddc2313: Merge "camera2: Increase preview frame timeout" into lmp-dev 
* commit 'c819ec1beee0d69ee956e77a57523596d17e3eb3':
  camera2: Increase preview frame timeout
 2014-09-24 22:54:24 +00:00
Dianne Hackborn
b7e71538e8 am 68212ccd: am 2ef7a650: am d5a4e173: am 5576641a: Merge "Fix issue #17614141: Add protection for accessing images" into lmp-dev 
* commit '68212ccd04e322070a2857fa029ce8771caec3c6':
  Fix issue #17614141: Add protection for accessing images
 2014-09-24 22:54:19 +00:00
Svetoslav
067f3fbfdf am 0804f1f5: am d32e5cc8: am 737fa54b: am 299a89b5: Merge "Print spooler should not crash if fed non-PDF content." into lmp-dev 
* commit '0804f1f543686026febf980614b4d98254c86b8f':
  Print spooler should not crash if fed non-PDF content.
 2014-09-24 22:54:15 +00:00
Derek Sollenberger
13e659cc55 am 869939a1: am 946c697a: am 07f751ba: am c37e905a: Merge "Fix memory leak where we close the descriptor instead of the file." into lmp-dev 
* commit '869939a186c610de90d247bc27f26260a26c3daa':
  Fix memory leak where we close the descriptor instead of the file.
 2014-09-24 22:54:10 +00:00
Mathieu Chartier
4084fe72bb am 890ef765: am 025b8203: am 443c7647: am a061388d: Merge "Fix dalvik map names" into lmp-dev 
* commit '890ef76560d34e325b82e1bf72336de8de838844':
  Fix dalvik map names
 2014-09-24 22:54:05 +00:00
Chet Haase
4999b789a7 am a37758c8: am 62a7327e: am 326c443e: am 66287788: Merge "Avoid drawing the starting window twice" into lmp-dev 
* commit 'a37758c8c96b472ee09c67638f518c124be1bf75':
  Avoid drawing the starting window twice
 2014-09-24 22:54:00 +00:00
Selim Cinek
40f6384b64 am c23d37aa: am 31dc5801: Only show FAB for the frontmost task 
* commit 'c23d37aae690001d7f5fd82c9db80fd01876e079':
  Only show FAB for the frontmost task
 2014-09-24 22:53:56 +00:00
Ruben Brunk
81ba98619b Merge "camera2: Hide JPEGs in RGBA gralloc buffers." into lmp-dev 2014-09-24 22:51:55 +00:00
Andreas Gampe
a2945aabd9 resolved conflicts for merge of dfdabe37 to lmp-mr1-dev-plus-aosp 
Change-Id: I3e9adb5fa67f8ca7ce8151c2dbf5c8fe5b40cb86
 2014-09-24 15:47:36 -07:00
RoboErik
e697d19d17 am e73770ce: am 0cbc26db: am 2a638f08: Merge "Clear the volume cache for all inactive state transitions" into lmp-dev 
* commit 'e73770ce807a9ed235eaaf4de951645407de6bc4':
  Clear the volume cache for all inactive state transitions
 2014-09-24 22:44:40 +00:00
Amith Yamasani
fb1d260716 am 57924e40: am de208628: am eb5fb023: Merge "Return masked location mode for managed profiles" into lmp-dev 
* commit '57924e406c3ca224a9e0d2fcba6db213caa1a54b':
  Return masked location mode for managed profiles
 2014-09-24 22:44:36 +00:00
Dianne Hackborn
4e6eb134a2 am a5fd257a: am 98b7584e: am 2a857c63: Merge "Work on issue #17624121: Settings crash while launching on wiped device" into lmp-dev 
* commit 'a5fd257acb22a8cdb170327856dd7145afc93b5b':
  Work on issue #17624121: Settings crash while launching on wiped device
 2014-09-24 22:44:32 +00:00
Igor Murashkin
e8aae2152b am e6339fe4: am ee0b9782: am 7ddc2313: Merge "camera2: Increase preview frame timeout" into lmp-dev 
* commit 'e6339fe4a71951dd6bff91a54a289137ff691f1a':
  camera2: Increase preview frame timeout
 2014-09-24 22:44:28 +00:00
Dianne Hackborn
a886377db6 am 2ef7a650: am d5a4e173: am 5576641a: Merge "Fix issue #17614141: Add protection for accessing images" into lmp-dev 
* commit '2ef7a650d6bb2764b2c3c566f99a1ac1b7f19372':
  Fix issue #17614141: Add protection for accessing images
 2014-09-24 22:44:24 +00:00
Svetoslav
48ca1cbdde am d32e5cc8: am 737fa54b: am 299a89b5: Merge "Print spooler should not crash if fed non-PDF content." into lmp-dev 
* commit 'd32e5cc8d56d8b8a5638417ae86bd16661304466':
  Print spooler should not crash if fed non-PDF content.
 2014-09-24 22:44:20 +00:00
Derek Sollenberger
102a9826b0 am 946c697a: am 07f751ba: am c37e905a: Merge "Fix memory leak where we close the descriptor instead of the file." into lmp-dev 
* commit '946c697abc160fc49446fa68976aff45efcd9005':
  Fix memory leak where we close the descriptor instead of the file.
 2014-09-24 22:44:15 +00:00
Mathieu Chartier
23f88f2ff1 am 025b8203: am 443c7647: am a061388d: Merge "Fix dalvik map names" into lmp-dev 
* commit '025b8203ffa22a7f6fc9aa3f054ab5f903735233':
  Fix dalvik map names
 2014-09-24 22:44:11 +00:00
Chet Haase
b4c610199e am 62a7327e: am 326c443e: am 66287788: Merge "Avoid drawing the starting window twice" into lmp-dev 
* commit '62a7327e74f1915d0fdb9b45b3e4f17e3967e1a4':
  Avoid drawing the starting window twice
 2014-09-24 22:44:06 +00:00
Selim Cinek
959d2c4066 am 31dc5801: Only show FAB for the frontmost task 
* commit '31dc5801f9da5acd8a250abc5c12d5e2bcf5da5d':
  Only show FAB for the frontmost task
 2014-09-24 22:44:01 +00:00
RoboErik
eda01ee7ed am 0cbc26db: am 2a638f08: Merge "Clear the volume cache for all inactive state transitions" into lmp-dev 
* commit '0cbc26dbee49058a8f2da8a4659943b3ee928b7d':
  Clear the volume cache for all inactive state transitions
 2014-09-24 22:28:12 +00:00
Amith Yamasani
a347c47183 am de208628: am eb5fb023: Merge "Return masked location mode for managed profiles" into lmp-dev 
* commit 'de20862808bcbd379b30d51271b2389f04b1924e':
  Return masked location mode for managed profiles
 2014-09-24 22:28:06 +00:00
Dianne Hackborn
581112831f am 98b7584e: am 2a857c63: Merge "Work on issue #17624121: Settings crash while launching on wiped device" into lmp-dev 
* commit '98b7584e1c45b9963a59de1625594c704065c575':
  Work on issue #17624121: Settings crash while launching on wiped device
 2014-09-24 22:27:41 +00:00
Igor Murashkin
fc4cba3619 am ee0b9782: am 7ddc2313: Merge "camera2: Increase preview frame timeout" into lmp-dev 
* commit 'ee0b9782a7ac2844f2942ba44bad4c36f235169c':
  camera2: Increase preview frame timeout
 2014-09-24 22:27:36 +00:00
Dianne Hackborn
30a28affe1 am d5a4e173: am 5576641a: Merge "Fix issue #17614141: Add protection for accessing images" into lmp-dev 
* commit 'd5a4e17395b62867945f0bd1c7df59fbe9dfba3c':
  Fix issue #17614141: Add protection for accessing images
 2014-09-24 22:27:23 +00:00
Svetoslav
0b71057e2d am 737fa54b: am 299a89b5: Merge "Print spooler should not crash if fed non-PDF content." into lmp-dev 
* commit '737fa54b1a5fc50fdcacdbad95ad2309bd40340c':
  Print spooler should not crash if fed non-PDF content.
 2014-09-24 22:27:07 +00:00
Derek Sollenberger
b468bba92a am 07f751ba: am c37e905a: Merge "Fix memory leak where we close the descriptor instead of the file." into lmp-dev 
* commit '07f751baac5be1184fa8868176fc7e8b4791c3f9':
  Fix memory leak where we close the descriptor instead of the file.
 2014-09-24 22:27:00 +00:00
Mathieu Chartier
f5ced0a9ed am 443c7647: am a061388d: Merge "Fix dalvik map names" into lmp-dev 
* commit '443c76479684c6aecf132b415aa7052c6bd9d174':
  Fix dalvik map names
 2014-09-24 22:26:56 +00:00
Chet Haase
5dfd08882c am 326c443e: am 66287788: Merge "Avoid drawing the starting window twice" into lmp-dev 
* commit '326c443e1bed7d0bd711ebfeb7f5c0003d534281':
  Avoid drawing the starting window twice
 2014-09-24 22:25:58 +00:00
Chris Wren
957ed70273 getCurrentInterruptionFilter should return the filter value, not the hints. 
Bug: 17641218
Change-Id: I4a6ff073c04a3d3624916293824faba40f6226aa
 2014-09-24 18:17:36 -04:00
Prerepa Viswanadham
f0b56a5a7f Remove remanents of onConnectionCongested in framwork 
Bug:17289507
Change-Id: Ia28c39822141edd0e4dc3f623b8c2f280fc5f943
 2014-09-24 22:15:08 +00:00
Andreas Gampe
dfdabe3728 am 6f954cf2: Merge "Frameworks/base: Early init native bridge" 
* commit '6f954cf2eb2baadf26bc0aba6272ef19b5dd45a0':
  Frameworks/base: Early init native bridge
 2014-09-24 22:10:15 +00:00
Selim Cinek
104aae1dcc Only show FAB for the frontmost task 
Bug: 17522143
Change-Id: I882185f27a4e9da57007818f678451a7e6e1ef81
 2014-09-24 22:05:59 +00:00