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

157328 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kenny Guy
867a2acda9 am 19acab1f: Merge "Ignore badly formed ComponentNames when loading device_owner.xml" into lmp-dev 
* commit '19acab1f8b24cb4265ed591fbec02ea13402d96a':
  Ignore badly formed ComponentNames when loading device_owner.xml
 2014-09-25 16:52:29 +00:00
Kenny Guy
baa05930ec Merge "Ignore badly formed ComponentNames when loading device_owner.xml" into lmp-dev 2014-09-25 16:42:11 +00:00
Ye Wen
6c88ddaef6 Hide carrier app intents in Telephony (1/2) 
b/17608135

Change-Id: Ib42d40cf8aac98f62c7237fa450463ff7c1a0f47
 2014-09-25 09:30:06 -07:00
Adrian Roos
ab7dae58cc Ensure that setting an empty password clears it 
Bug: 17496766
Change-Id: I7c29b632519247bc5675a05ef6cc90902fec8527
 2014-09-25 18:25:21 +02:00
John Reck
fa8c074faf am e5831979: Missing null check 
* commit 'e58319791de1e47db1d6d3c6565f03a5f775a9cb':
  Missing null check
 2014-09-25 16:14:25 +00:00
Kenny Guy
be16357f40 Ignore badly formed ComponentNames when loading device_owner.xml 
In the past we wrote out badly formed ComponentNames with no
class part. Loading these results in a null pointer exception
blocking boot.

Bug: 17652534
Change-Id: Iec592343425a23c7ada5f73cf30b8646d31eae81
 2014-09-25 17:03:53 +01:00
John Reck
ccf2fa0031 Missing null check 
Bug: 17642023
Change-Id: I874b76e1e184a59dec714191d759c1045b7b9814
 2014-09-25 08:33:05 -07:00
Christoph Studer
8465c00440 am 78205c2b: Merge "NoMan: Add 3s timeout in matchesCallFilter()" into lmp-dev 
* commit '78205c2b2e4f28cdafff93be2c599097b1b9f00d':
  NoMan: Add 3s timeout in matchesCallFilter()
 2014-09-25 11:03:02 +00:00
Christoph Studer
e1b032a840 Merge "NoMan: Add 3s timeout in matchesCallFilter()" into lmp-dev 2014-09-25 10:53:47 +00:00
Przemyslaw Szczepaniak
6ddd9c29b3 Fix ambiguous TTS#playSilence method. 
Due to recent fixes for TTS API review (b/17389935)
overloaded playSilence method became ambiguous when
the last argument is null. This change renames the new
method to playSilentUtterance solving the issue.

Also, since LMP API level is 21, I updated invalid
references to it as API level 20 inside speech.tts.

Bug: 17389935
Change-Id: I9f9fae988240d1cec45d44650e53ffc29803ccac
 2014-09-25 11:26:31 +01:00
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
ac1e24986c am ca7f391e: Merge "MediaCodecList: fix findEncoderForFormat." into lmp-dev 
* commit 'ca7f391e2b04a9efc4beb5f5b769653a983ff424':
  MediaCodecList: fix findEncoderForFormat.
 2014-09-25 00:27:44 +00:00
Sukanya Rajkhowa
2b286d54d1 am 14cb7b8a: Add config to control phone switch 
* commit '14cb7b8aeb99d3337b191a49ab11eb8642cde5fa':
  Add config to control phone switch
 2014-09-25 00:27:40 +00:00
Lajos Molnar
22da05cb23 am 4e43a27a: Merge "MediaCodec: revalidate cached queued input buffers if queue fails (2)" into lmp-dev 
* commit '4e43a27a9884e24ba47599597091176b772ddb24':
  MediaCodec: revalidate cached queued input buffers if queue fails (2)
 2014-09-25 00:27:36 +00: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
f89e018177 am fe99f9f4: Merge "Remove remanents of onConnectionCongested in framwork" into lmp-dev 
* commit 'fe99f9f42ad1a45922c906bacd5ea56d58667245':
  Remove remanents of onConnectionCongested in framwork
 2014-09-24 23:59:44 +00:00
Vinit Deshpande
2d9eda4aaf am f9b8c88c: Merge "Introduce config setting for scanning mac OUI" into lmp-dev 
* commit 'f9b8c88c6529daebe9676d7c440fcd3e478ec034':
  Introduce config setting for scanning mac OUI
 2014-09-24 23:59:40 +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
752c0e95d6 am aa1f0856: Merge "MediaCodec: revalidate cached queued input buffers if queue fails" into lmp-dev 
* commit 'aa1f0856a144f2f2ba14c6358d633887e7e8b936':
  MediaCodec: revalidate cached queued input buffers if queue fails
 2014-09-24 23:47:31 +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
c4997a1d9c am 45ef18b6: Merge "Include reason when wiping data." into lmp-dev 
* commit '45ef18b63e78fd853865f42d9369a5c9b4dd4ba0':
  Include reason when wiping data.
 2014-09-24 23:35:37 +00:00
Jeff Sharkey
0a285b4462 Merge "Include reason when wiping data." into lmp-dev 2014-09-24 23:27:25 +00:00
ztenghui
20c0579c63 am a00457a6: Merge "Add one more test and update old tests" into lmp-dev 
* commit 'a00457a60160f27e15c9d75824057f7d914b7b7d':
  Add one more test and update old tests
 2014-09-24 23:18:19 +00:00
ztenghui
533b4d3e51 am c793e67c: Merge "Fix AVD for CTS failure." into lmp-dev 
* commit 'c793e67ca93a1550fa68c887ef00d207ac1e1d84':
  Fix AVD for CTS failure.
 2014-09-24 23:18:15 +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
Ruben Brunk
bc167acc25 am 8acfdc7b: Merge "camera2: Hide JPEGs in RGBA gralloc buffers." into lmp-dev 
* commit '8acfdc7bf6b8ee5250351723ab2eef28f2b71e51':
  camera2: Hide JPEGs in RGBA gralloc buffers.
 2014-09-24 23:01:08 +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
a103ebed6e resolved conflicts for merge of dfdabe37 to lmp-dev-plus-aosp 
Change-Id: Ia9c350dcfb41f9d04400a86bd7e5f2cf2af656f1
 2014-09-24 15:38:02 -07: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
Joe Fernandez
ec4697fad7 am a73fa92c: am 2c1ef532: am 1968b919: am b8a60dad: Merge "docs: Update the staging app.yaml to be compatible with GAE 1.9.4 and higher" into klp-modular-docs 
* commit 'a73fa92c2e0bada989b9196425e179fcc5b8b0de':
  docs: Update the staging app.yaml to be compatible with GAE 1.9.4 and higher
 2014-09-24 22:04:34 +00:00
Andreas Gampe
6f954cf2eb Merge "Frameworks/base: Early init native bridge" 2014-09-24 21:59:51 +00:00
Joe Fernandez
a8f4252d2a am 2c1ef532: am 1968b919: am b8a60dad: Merge "docs: Update the staging app.yaml to be compatible with GAE 1.9.4 and higher" into klp-modular-docs 
* commit '2c1ef5328cee7059b1ab0d8de849c2fa474f88dd':
  docs: Update the staging app.yaml to be compatible with GAE 1.9.4 and higher
 2014-09-24 21:54:08 +00:00
RoboErik
e053f625f7 am 2a638f08: Merge "Clear the volume cache for all inactive state transitions" into lmp-dev 
* commit '2a638f08dc4c750bfd0e358768ddde98c7f23b09':
  Clear the volume cache for all inactive state transitions
 2014-09-24 21:48:26 +00:00
Yao Chen
2354c5eb92 Check the return value of bindService, and notify media browser client 
onConnectionFailed if it returns false.

Bug: 17637058
Change-Id: I2284c3a982e5ac6323f51ff7d98aae7699c695e5
 2014-09-24 21:45:58 +00:00
RoboErik
143dc769ef Merge "Clear the volume cache for all inactive state transitions" into lmp-dev 2014-09-24 21:35:56 +00:00
RoboErik
88b84178d6 Ensure MediaBrowser state is set to connecting after a reconnect 
When the binder had disconnected we were setting the state to suspended
and then not setting it back to connecting when we reconnected. This sets
the state correctly when we are trying to connect again.

bug:17593681
Change-Id: I3fe95fa23ba43ac2dc3692fd28309b2f8e5a3599
 2014-09-24 14:35:32 -07:00
RoboErik
03fce072ca Allow null queues to be set in MediaSession 
Also add some test code for it to OneMedia.

bug:17593962
Change-Id: I074e2bb0329d9a97f623e4309bb7dada157b8324
 2014-09-24 14:35:32 -07:00
Amith Yamasani
c60d0ba300 am eb5fb023: Merge "Return masked location mode for managed profiles" into lmp-dev 
* commit 'eb5fb0236f3ed0c8068d5e65f2396047ae69f78b':
  Return masked location mode for managed profiles
 2014-09-24 21:35:08 +00:00
Amith Yamasani
d9cb5a7344 Merge "Return masked location mode for managed profiles" into lmp-dev 2014-09-24 21:28:43 +00:00