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

153903 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Wren
0968a63084 am cad81c3e: am 3c7f1aac: am 15653a91: Merge "getCurrentInterruptionFilter should return the filter value, not the hints." into lmp-dev 
* commit 'cad81c3e473d5af91f83889451070863d0021288':
  getCurrentInterruptionFilter should return the filter value, not the hints.
 2014-09-25 17:52:38 +00:00
Chris Wren
fa3f1232dd am 3c7f1aac: am 15653a91: Merge "getCurrentInterruptionFilter should return the filter value, not the hints." into lmp-dev 
* commit '3c7f1aacb544db6984a19c933bf9a5975b6c0bf4':
  getCurrentInterruptionFilter should return the filter value, not the hints.
 2014-09-25 17:41:24 +00:00
Chris Wren
0a94bebf2e am 15653a91: Merge "getCurrentInterruptionFilter should return the filter value, not the hints." into lmp-dev 
* commit '15653a918f6c1747d08f03e8241368bbbcc38fe6':
  getCurrentInterruptionFilter should return the filter value, not the hints.
 2014-09-25 17:29:25 +00:00
Chris Wren
b698185929 Merge "getCurrentInterruptionFilter should return the filter value, not the hints." into lmp-dev 2014-09-25 17:21:32 +00:00
Kenny Guy
5233ca17a8 am fbe543fd: am e50eceb1: am 19acab1f: Merge "Ignore badly formed ComponentNames when loading device_owner.xml" into lmp-dev 
* commit 'fbe543fd1ce9ba4f775b166f301ff69457fb4565':
  Ignore badly formed ComponentNames when loading device_owner.xml
 2014-09-25 17:12:02 +00:00
Kenny Guy
ec142f84f1 am e50eceb1: am 19acab1f: Merge "Ignore badly formed ComponentNames when loading device_owner.xml" into lmp-dev 
* commit 'e50eceb1d6d9e27db2f182bc4fd46d184484e00f':
  Ignore badly formed ComponentNames when loading device_owner.xml
 2014-09-25 16:58:58 +00:00
John Reck
40c824763f am 4dd90969: am 2994cc57: am e5831979: Missing null check 
* commit '4dd90969d755305a70aee8759cd0210a6b42c425':
  Missing null check
 2014-09-25 16:52:46 +00:00
Christoph Studer
8e9914cafc am 1c662485: am d9ca58c6: am 78205c2b: Merge "NoMan: Add 3s timeout in matchesCallFilter()" into lmp-dev 
* commit '1c662485e4a3206e430eafa7300a0f63e2eb45da':
  NoMan: Add 3s timeout in matchesCallFilter()
 2014-09-25 16:52:42 +00:00
Ronghua Wu
c2a1bce171 am 2f1e6478: am 5817765c: am ca7f391e: Merge "MediaCodecList: fix findEncoderForFormat." into lmp-dev 
* commit '2f1e6478aeaedbcaa396760f2e9351c394a2e47f':
  MediaCodecList: fix findEncoderForFormat.
 2014-09-25 16:52:22 +00:00
Sukanya Rajkhowa
e6835028df am 518db096: am 5699372f: am 14cb7b8a: Add config to control phone switch 
* commit '518db096f4d8debe0d93f2c98dc9024e44d541d6':
  Add config to control phone switch
 2014-09-25 16:52:17 +00:00
Lajos Molnar
ac57da3cbc am f4bab345: am a3608e7a: am 4e43a27a: Merge "MediaCodec: revalidate cached queued input buffers if queue fails (2)" into lmp-dev 
* commit 'f4bab345a5ee71031e2d4623705f7cbdc8067edb':
  MediaCodec: revalidate cached queued input buffers if queue fails (2)
 2014-09-25 16:52:14 +00:00
Kenny Guy
4efd2a59f9 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:12 +00:00
Andre Eisenbach
644c645a11 am c9e7505a: am 630f9671: am fe99f9f4: Merge "Remove remanents of onConnectionCongested in framwork" into lmp-dev 
* commit 'c9e7505a0ab0ff337e09bed6afdeef86512cda5f':
  Remove remanents of onConnectionCongested in framwork
 2014-09-25 16:52:10 +00:00
Vinit Deshpande
1dfe930a56 am 31103492: am 0604f9b7: am f9b8c88c: Merge "Introduce config setting for scanning mac OUI" into lmp-dev 
* commit '311034922d795ec7807ff3f29f399568a6600bf7':
  Introduce config setting for scanning mac OUI
 2014-09-25 16:52:07 +00:00
Lajos Molnar
ce27c23591 am c8d99e5c: am 7c993e8c: am aa1f0856: Merge "MediaCodec: revalidate cached queued input buffers if queue fails" into lmp-dev 
* commit 'c8d99e5ca8b0c7d3e2e83023a6930fbf8664ce78':
  MediaCodec: revalidate cached queued input buffers if queue fails
 2014-09-25 16:52:03 +00:00
Jeff Sharkey
8d22be098e am b47a75f2: am b8bbeff0: am 45ef18b6: Merge "Include reason when wiping data." into lmp-dev 
* commit 'b47a75f227bd43f90c2f437ea991d5fa42603d04':
  Include reason when wiping data.
 2014-09-25 16:51:59 +00:00
ztenghui
c35ca01939 am 0ecbcd00: am 64816d53: am a00457a6: Merge "Add one more test and update old tests" into lmp-dev 
* commit '0ecbcd0043a6fb065b86de6da6edc8e967420a24':
  Add one more test and update old tests
 2014-09-25 16:51:54 +00:00
ztenghui
c30fe2ccad am 6bdc2e08: am 7ac0a907: am c793e67c: Merge "Fix AVD for CTS failure." into lmp-dev 
* commit '6bdc2e08b712f147e5aeec39afded3d723b8426c':
  Fix AVD for CTS failure.
 2014-09-25 16:51:50 +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
John Reck
ca915dd6aa am 2994cc57: am e5831979: Missing null check 
* commit '2994cc57444cc0ae83081f2324a5ce94ab58965a':
  Missing null check
 2014-09-25 16:38:37 +00:00
Christoph Studer
2a188d34e0 am d9ca58c6: am 78205c2b: Merge "NoMan: Add 3s timeout in matchesCallFilter()" into lmp-dev 
* commit 'd9ca58c678082a62d62df92a4f0921aaef353894':
  NoMan: Add 3s timeout in matchesCallFilter()
 2014-09-25 16:38:33 +00:00
Ronghua Wu
99cd62f8c4 am 5817765c: am ca7f391e: Merge "MediaCodecList: fix findEncoderForFormat." into lmp-dev 
* commit '5817765c034d41881ebfe72d7d6d0c81a2ed8e10':
  MediaCodecList: fix findEncoderForFormat.
 2014-09-25 16:38:30 +00:00
Sukanya Rajkhowa
9465446f6a am 5699372f: am 14cb7b8a: Add config to control phone switch 
* commit '5699372fe72f36e3020464a687f1346f5f325ae6':
  Add config to control phone switch
 2014-09-25 16:38:26 +00:00
Lajos Molnar
1f146f40d0 am a3608e7a: am 4e43a27a: Merge "MediaCodec: revalidate cached queued input buffers if queue fails (2)" into lmp-dev 
* commit 'a3608e7a5ea4a489830336cfb37ffefb77e89e6d':
  MediaCodec: revalidate cached queued input buffers if queue fails (2)
 2014-09-25 16:38:23 +00:00
Andre Eisenbach
b3e68eb21c am 630f9671: am fe99f9f4: Merge "Remove remanents of onConnectionCongested in framwork" into lmp-dev 
* commit '630f9671beae6a09e8a1fa315b632d292a83c4f0':
  Remove remanents of onConnectionCongested in framwork
 2014-09-25 16:38:19 +00:00
Vinit Deshpande
5fc770d2a0 am 0604f9b7: am f9b8c88c: Merge "Introduce config setting for scanning mac OUI" into lmp-dev 
* commit '0604f9b7eaf51920c177f5af845bb254c3695074':
  Introduce config setting for scanning mac OUI
 2014-09-25 16:38:15 +00:00
Lajos Molnar
4867c6bff2 am 7c993e8c: am aa1f0856: Merge "MediaCodec: revalidate cached queued input buffers if queue fails" into lmp-dev 
* commit '7c993e8c16de0322ee231979b798cc40cd5b1576':
  MediaCodec: revalidate cached queued input buffers if queue fails
 2014-09-25 16:38:12 +00:00
Jeff Sharkey
c1411a4253 am b8bbeff0: am 45ef18b6: Merge "Include reason when wiping data." into lmp-dev 
* commit 'b8bbeff0796847bbe98deb2d84989b656356873c':
  Include reason when wiping data.
 2014-09-25 16:38:08 +00:00
ztenghui
39b5e7a88f am 64816d53: am a00457a6: Merge "Add one more test and update old tests" into lmp-dev 
* commit '64816d534c0bc42f5e83bd24bb6c452f61e61fdc':
  Add one more test and update old tests
 2014-09-25 16:38:05 +00:00
ztenghui
e44af7d3a7 am 7ac0a907: am c793e67c: Merge "Fix AVD for CTS failure." into lmp-dev 
* commit '7ac0a907051287a9cb01b3b54332a7ba865102e6':
  Fix AVD for CTS failure.
 2014-09-25 16:38:00 +00:00
John Reck
07b3c7428a am e5831979: Missing null check 
* commit 'e58319791de1e47db1d6d3c6565f03a5f775a9cb':
  Missing null check
 2014-09-25 16:24:33 +00:00
Christoph Studer
6d0be31ff2 am 78205c2b: Merge "NoMan: Add 3s timeout in matchesCallFilter()" into lmp-dev 
* commit '78205c2b2e4f28cdafff93be2c599097b1b9f00d':
  NoMan: Add 3s timeout in matchesCallFilter()
 2014-09-25 16:24:22 +00:00
Ronghua Wu
2a7667de96 am ca7f391e: Merge "MediaCodecList: fix findEncoderForFormat." into lmp-dev 
* commit 'ca7f391e2b04a9efc4beb5f5b769653a983ff424':
  MediaCodecList: fix findEncoderForFormat.
 2014-09-25 16:23:16 +00:00
Sukanya Rajkhowa
7d695dd8d8 am 14cb7b8a: Add config to control phone switch 
* commit '14cb7b8aeb99d3337b191a49ab11eb8642cde5fa':
  Add config to control phone switch
 2014-09-25 16:23:11 +00:00
Lajos Molnar
d9298cfc2f 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 16:23:07 +00:00
Andre Eisenbach
9bb34605ce am fe99f9f4: Merge "Remove remanents of onConnectionCongested in framwork" into lmp-dev 
* commit 'fe99f9f42ad1a45922c906bacd5ea56d58667245':
  Remove remanents of onConnectionCongested in framwork
 2014-09-25 16:22:45 +00:00
Vinit Deshpande
76d2183725 am f9b8c88c: Merge "Introduce config setting for scanning mac OUI" into lmp-dev 
* commit 'f9b8c88c6529daebe9676d7c440fcd3e478ec034':
  Introduce config setting for scanning mac OUI
 2014-09-25 16:22:40 +00:00
Lajos Molnar
7f2ce4cdcf 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-25 16:22:31 +00:00
Jeff Sharkey
2649756975 am 45ef18b6: Merge "Include reason when wiping data." into lmp-dev 
* commit '45ef18b63e78fd853865f42d9369a5c9b4dd4ba0':
  Include reason when wiping data.
 2014-09-25 16:22:22 +00:00
ztenghui
958614be0b 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-25 16:22:10 +00:00
ztenghui
acd80709e1 am c793e67c: Merge "Fix AVD for CTS failure." into lmp-dev 
* commit 'c793e67ca93a1550fa68c887ef00d207ac1e1d84':
  Fix AVD for CTS failure.
 2014-09-25 16:22:06 +00:00
Evan Charlton
d7f6d178be am 8bc6212e: Merge "Revert "@hide ConnectionService APIs."" into lmp-mr1-dev 
* commit '8bc6212eeb926b1f00e73af924e1f072f99160b3':
  Revert "@hide ConnectionService APIs."
 2014-09-25 16:06:48 +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
Evan Charlton
5fa8fe6671 Merge "Revert "@hide ConnectionService APIs."" into lmp-mr1-dev 2014-09-25 15:58:35 +00:00
John Reck
ccf2fa0031 Missing null check 
Bug: 17642023
Change-Id: I874b76e1e184a59dec714191d759c1045b7b9814
 2014-09-25 08:33:05 -07:00
Christoph Studer
e1b032a840 Merge "NoMan: Add 3s timeout in matchesCallFilter()" into lmp-dev 2014-09-25 10:53:47 +00:00
Ruben Brunk
a7c17bedbe am ae7ff48d: am 6a7dcedf: am 8acfdc7b: Merge "camera2: Hide JPEGs in RGBA gralloc buffers." into lmp-dev 
* commit 'ae7ff48d3aaf2459d7f146e1a80a55334664dd16':
  camera2: Hide JPEGs in RGBA gralloc buffers.
 2014-09-25 10:14:07 +00:00
Joe Fernandez
3e80a239a9 am 3386946d: am a4f4bd40: 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 '3386946d60245a5b5777bfb4e79d175e72ff2481':
  docs: Update the staging app.yaml to be compatible with GAE 1.9.4 and higher
 2014-09-25 10:14:03 +00:00
Ruben Brunk
fb444ce6f8 am 6a7dcedf: am 8acfdc7b: Merge "camera2: Hide JPEGs in RGBA gralloc buffers." into lmp-dev 
* commit '6a7dcedf4f3a3af8ccbaebc9ec9dd02796d4e93e':
  camera2: Hide JPEGs in RGBA gralloc buffers.
 2014-09-25 10:03:40 +00:00
Joe Fernandez
825896adf8 am a4f4bd40: 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 'a4f4bd40cad463e6faeebec6694dd78ce7456f20':
  docs: Update the staging app.yaml to be compatible with GAE 1.9.4 and higher
 2014-09-25 10:03:37 +00:00