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

164294 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Junda Liu
5c65836f58 am 85764048: am 73d72b60: am 8e61b503: am 63f0b87e: am 96c54879: Merge "Hide CarrierPrivilege APIs in TelMgr." into lmp-dev 
* commit '8576404876fe609d74c26945fa4b5beb9a0edf96':
  Hide CarrierPrivilege APIs in TelMgr.
 2014-09-26 15:25:43 +00:00
Chris Wren
60772b487d am 18fc9f40: am 969cb2db: am cad81c3e: am 3c7f1aac: am 15653a91: Merge "getCurrentInterruptionFilter should return the filter value, not the hints." into lmp-dev 
* commit '18fc9f40a61e90feb6154702db91cd25c4a4f752':
  getCurrentInterruptionFilter should return the filter value, not the hints.
 2014-09-26 15:25:37 +00:00
Kenny Guy
d865bb8a07 am 6667168a: am 07f86bcb: am fbe543fd: am e50eceb1: am 19acab1f: Merge "Ignore badly formed ComponentNames when loading device_owner.xml" into lmp-dev 
* commit '6667168ab0330cf74b016df89210150d1a517ac5':
  Ignore badly formed ComponentNames when loading device_owner.xml
 2014-09-26 15:25:32 +00:00
Junda Liu
6c49e6e923 am 73d72b60: am 8e61b503: am 63f0b87e: am 96c54879: Merge "Hide CarrierPrivilege APIs in TelMgr." into lmp-dev 
* commit '73d72b6067d7b25c6727b054cfcc44997d03fc23':
  Hide CarrierPrivilege APIs in TelMgr.
 2014-09-26 00:23:03 +00:00
Chris Wren
ae208ba9ce am 969cb2db: am cad81c3e: am 3c7f1aac: am 15653a91: Merge "getCurrentInterruptionFilter should return the filter value, not the hints." into lmp-dev 
* commit '969cb2db770a44f1265dc57910edc3f58ae0fbbe':
  getCurrentInterruptionFilter should return the filter value, not the hints.
 2014-09-26 00:22:56 +00:00
Kenny Guy
b09cdd0a07 am 07f86bcb: am fbe543fd: am e50eceb1: am 19acab1f: Merge "Ignore badly formed ComponentNames when loading device_owner.xml" into lmp-dev 
* commit '07f86bcbd5c259fd59c49d7fd9e7dcf26508bdbd':
  Ignore badly formed ComponentNames when loading device_owner.xml
 2014-09-26 00:22:40 +00:00
Dan Albert
aa062ff381 am 5a755a5a: am c20a4bd1: (-s ours) am d7baaed8: Merge "Allow AOSP to boot." 
* commit '5a755a5a3f2a15970e4d2a8cbfde614f52c333c7':
  Allow AOSP to boot.
 2014-09-25 19:36:25 +00:00
Dan Albert
463c7cadf5 am c20a4bd1: (-s ours) am d7baaed8: Merge "Allow AOSP to boot." 
* commit 'c20a4bd1a422663bb5ec8cd84c5a8bdd0476bb95':
  Allow AOSP to boot.
 2014-09-25 19:23:24 +00:00
Dan Albert
c20a4bd1a4 am d7baaed8: Merge "Allow AOSP to boot." 
* commit 'd7baaed89e498ad3cf7d9c487d6cae967e562ea4':
  Allow AOSP to boot.
 2014-09-25 19:00:34 +00:00
Dan Albert
d7baaed89e Merge "Allow AOSP to boot." 2014-09-25 18:50:18 +00:00
Dan Albert
e08bd64184 Allow AOSP to boot. 
HAVE_OOM_ADJ is really __linux__, and this code should never be run on
another platform.

Bug: 17641445
Change-Id: Ib8174106b6d03c9c2429794a4f582c09cb308646
 2014-09-25 11:48:11 -07:00
Junda Liu
05b1f42dd0 am 8e61b503: am 63f0b87e: am 96c54879: Merge "Hide CarrierPrivilege APIs in TelMgr." into lmp-dev 
* commit '8e61b5036f0c2479b9735255bb409601932806f0':
  Hide CarrierPrivilege APIs in TelMgr.
 2014-09-25 18:27:58 +00:00
Junda Liu
cfac510914 am 63f0b87e: am 96c54879: Merge "Hide CarrierPrivilege APIs in TelMgr." into lmp-dev 
* commit '63f0b87ee3a0df19eec15e73cfbfb9b97623534c':
  Hide CarrierPrivilege APIs in TelMgr.
 2014-09-25 18:17:52 +00:00
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
Junda Liu
cb6b5f9bd1 am 96c54879: Merge "Hide CarrierPrivilege APIs in TelMgr." into lmp-dev 
* commit '96c548791145ab33ceb0935f38323d3182d44419':
  Hide CarrierPrivilege APIs in TelMgr.
 2014-09-25 17:46:39 +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
Junda Liu
698b3b2981 Merge "Hide CarrierPrivilege APIs in TelMgr." into lmp-dev 2014-09-25 17:36:11 +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
Junda Liu
bac6d61ab6 Hide CarrierPrivilege APIs in TelMgr. 
Per API council decision, we will polish and public in MR1.

Bug: b/17639966
Change-Id: Id009cd62b4d44dd17fe7a30e0f8037c6fb373c32
 2014-09-25 10:25:10 -07: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
John Reck
1ffaabc4c9 am f04bc7e4: am 4f6fa843: am 4dd90969: am 2994cc57: am e5831979: Missing null check 
* commit 'f04bc7e4892bc6be7cc40f5525f5ddd037ec74b8':
  Missing null check
 2014-09-25 17:19:09 +00:00
Christoph Studer
c085d57802 am 8efb93f2: am 0b6844cd: am 1c662485: am d9ca58c6: am 78205c2b: Merge "NoMan: Add 3s timeout in matchesCallFilter()" into lmp-dev 
* commit '8efb93f27bee0f16612e108bf67b2a340c99c0a3':
  NoMan: Add 3s timeout in matchesCallFilter()
 2014-09-25 17:19:04 +00:00
Ronghua Wu
bf957c2fb5 am 0a84c4c9: am bf14a4e6: am 2f1e6478: am 5817765c: am ca7f391e: Merge "MediaCodecList: fix findEncoderForFormat." into lmp-dev 
* commit '0a84c4c9ad2c62b788047e762ef73ca0623e4a0a':
  MediaCodecList: fix findEncoderForFormat.
 2014-09-25 17:18:59 +00:00
Sukanya Rajkhowa
36bf8f5898 am 5a911205: am 57674c99: am 518db096: am 5699372f: am 14cb7b8a: Add config to control phone switch 
* commit '5a911205eac93323981855fb82004ae555a0d331':
  Add config to control phone switch
 2014-09-25 17:18:54 +00:00
Lajos Molnar
0677a41661 am 11148f96: am a91920f0: am f4bab345: am a3608e7a: am 4e43a27a: Merge "MediaCodec: revalidate cached queued input buffers if queue fails (2)" into lmp-dev 
* commit '11148f9683a0eec69101d87177d69d96ce944d92':
  MediaCodec: revalidate cached queued input buffers if queue fails (2)
 2014-09-25 17:18:49 +00:00
Andre Eisenbach
196abec5e9 am 8ba97cf8: am 05d80488: am c9e7505a: am 630f9671: am fe99f9f4: Merge "Remove remanents of onConnectionCongested in framwork" into lmp-dev 
* commit '8ba97cf8845e31103dbf14a7072760f5275b71ab':
  Remove remanents of onConnectionCongested in framwork
 2014-09-25 17:18:45 +00:00
Vinit Deshpande
501a593540 am 6c77445b: am 574e57da: am 31103492: am 0604f9b7: am f9b8c88c: Merge "Introduce config setting for scanning mac OUI" into lmp-dev 
* commit '6c77445b5d025f34a744b9ffcf3df26592f9e480':
  Introduce config setting for scanning mac OUI
 2014-09-25 17:18:41 +00:00
Lajos Molnar
b2fe00034d am 4d53a61b: am 36dbe967: am c8d99e5c: am 7c993e8c: am aa1f0856: Merge "MediaCodec: revalidate cached queued input buffers if queue fails" into lmp-dev 
* commit '4d53a61b6636dcc4be7089daef59a159d567636a':
  MediaCodec: revalidate cached queued input buffers if queue fails
 2014-09-25 17:18:36 +00:00
Jeff Sharkey
c894355d7e am d46c9385: am 1eb1a4fa: am b47a75f2: am b8bbeff0: am 45ef18b6: Merge "Include reason when wiping data." into lmp-dev 
* commit 'd46c93852393569e3211fc7bada91e712634572e':
  Include reason when wiping data.
 2014-09-25 17:18:31 +00:00
ztenghui
f06355712a am e7b9e3c6: am 72e1f678: am 0ecbcd00: am 64816d53: am a00457a6: Merge "Add one more test and update old tests" into lmp-dev 
* commit 'e7b9e3c6a36f0f88b345204249c0848cc4cfb2d9':
  Add one more test and update old tests
 2014-09-25 17:18:26 +00:00
ztenghui
34ee1d2648 am e25159c4: am 4706b24e: am 6bdc2e08: am 7ac0a907: am c793e67c: Merge "Fix AVD for CTS failure." into lmp-dev 
* commit 'e25159c448db6abc85d95abcc28ac1edea1f78a5':
  Fix AVD for CTS failure.
 2014-09-25 17:18:19 +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
John Reck
9bb49fe22d am 4f6fa843: am 4dd90969: am 2994cc57: am e5831979: Missing null check 
* commit '4f6fa8433493221fc55a25aa9e958f4b188fe5a5':
  Missing null check
 2014-09-25 17:06:22 +00:00
Christoph Studer
6e48508bcb am 0b6844cd: am 1c662485: am d9ca58c6: am 78205c2b: Merge "NoMan: Add 3s timeout in matchesCallFilter()" into lmp-dev 
* commit '0b6844cd107945ca60165167c56afba71d559cc1':
  NoMan: Add 3s timeout in matchesCallFilter()
 2014-09-25 17:06:18 +00:00
Ronghua Wu
87fb4fb9c1 am bf14a4e6: am 2f1e6478: am 5817765c: am ca7f391e: Merge "MediaCodecList: fix findEncoderForFormat." into lmp-dev 
* commit 'bf14a4e6ea6f2c70152a9456ed790fc460734e16':
  MediaCodecList: fix findEncoderForFormat.
 2014-09-25 17:06:13 +00:00
Sukanya Rajkhowa
705b41ea16 am 57674c99: am 518db096: am 5699372f: am 14cb7b8a: Add config to control phone switch 
* commit '57674c99243b51b13cbea48766e30e67cd9448d6':
  Add config to control phone switch
 2014-09-25 17:06:09 +00:00
Lajos Molnar
59432a4c7e am a91920f0: am f4bab345: am a3608e7a: am 4e43a27a: Merge "MediaCodec: revalidate cached queued input buffers if queue fails (2)" into lmp-dev 
* commit 'a91920f0f81e32dbfd408db8b0e26c139fdded74':
  MediaCodec: revalidate cached queued input buffers if queue fails (2)
 2014-09-25 17:06:04 +00:00
Andre Eisenbach
114e82321b am 05d80488: am c9e7505a: am 630f9671: am fe99f9f4: Merge "Remove remanents of onConnectionCongested in framwork" into lmp-dev 
* commit '05d8048883b25f0f65e689880221c7b5af9f7c52':
  Remove remanents of onConnectionCongested in framwork
 2014-09-25 17:05:59 +00:00
Vinit Deshpande
14abc8744c am 574e57da: am 31103492: am 0604f9b7: am f9b8c88c: Merge "Introduce config setting for scanning mac OUI" into lmp-dev 
* commit '574e57da1851f1375c5526b6b0b35fe56dc16fb6':
  Introduce config setting for scanning mac OUI
 2014-09-25 17:05:55 +00:00
Lajos Molnar
94831b82be am 36dbe967: am c8d99e5c: am 7c993e8c: am aa1f0856: Merge "MediaCodec: revalidate cached queued input buffers if queue fails" into lmp-dev 
* commit '36dbe967a0027842abe9051ddc4a87704785f84c':
  MediaCodec: revalidate cached queued input buffers if queue fails
 2014-09-25 17:05:47 +00:00
Jeff Sharkey
52e40aaa8a am 1eb1a4fa: am b47a75f2: am b8bbeff0: am 45ef18b6: Merge "Include reason when wiping data." into lmp-dev 
* commit '1eb1a4fa28d74312b329daaecd8a81fcf367eea4':
  Include reason when wiping data.
 2014-09-25 17:05:42 +00:00
ztenghui
32b6756bfe am 72e1f678: am 0ecbcd00: am 64816d53: am a00457a6: Merge "Add one more test and update old tests" into lmp-dev 
* commit '72e1f678dfd8adc69f60507495b9275bd098714e':
  Add one more test and update old tests
 2014-09-25 17:05:38 +00:00
ztenghui
134fe8ef66 am 4706b24e: am 6bdc2e08: am 7ac0a907: am c793e67c: Merge "Fix AVD for CTS failure." into lmp-dev 
* commit '4706b24e3d15b5b593a48658eab4af60df782a2e':
  Fix AVD for CTS failure.
 2014-09-25 17:05:34 +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