OSDN Git Service
RoboErik [Fri, 26 Sep 2014 00:23:48 +0000 (00:23 +0000)]
am
7df93654: am
54218f6b: am
10a7dfea: am
504752fb: Merge "Ensure MediaBrowser state is set to connecting after a reconnect" into lmp-dev
* commit '
7df9365479e7e775bdaf32d9b5ed9a6eabcfa1fe':
Ensure MediaBrowser state is set to connecting after a reconnect
RoboErik [Fri, 26 Sep 2014 00:23:43 +0000 (00:23 +0000)]
am
5e8f023d: am
a59c7f03: am
dff59b8b: am
23df1c46: Merge "Allow null queues to be set in MediaSession" into lmp-dev
* commit '
5e8f023dc17788a18bc5640a42baaf2bec609745':
Allow null queues to be set in MediaSession
Ye Wen [Fri, 26 Sep 2014 00:23:09 +0000 (00:23 +0000)]
am
f0df354b: am
272f2321: am
a0945b40: resolved conflicts for merge of
13ff7c17 to lmp-sprout-dev
* commit '
f0df354b0aa1880bae34034cc83ec472e5ff404e':
Hide carrier app intents in Telephony (1/2)
Junda Liu [Fri, 26 Sep 2014 00:23:03 +0000 (00:23 +0000)]
am
73d72b60: am
8e61b503: am
63f0b87e: am
96c54879: Merge "Hide CarrierPrivilege APIs in TelMgr." into lmp-dev
* commit '
73d72b6067d7b25c6727b054cfcc44997d03fc23':
Hide CarrierPrivilege APIs in TelMgr.
Chris Wren [Fri, 26 Sep 2014 00:22:56 +0000 (00:22 +0000)]
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.
Kenny Guy [Fri, 26 Sep 2014 00:22:40 +0000 (00:22 +0000)]
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
Dan Albert [Thu, 25 Sep 2014 19:23:24 +0000 (19:23 +0000)]
am
c20a4bd1: (-s ours) am
d7baaed8: Merge "Allow AOSP to boot."
* commit '
c20a4bd1a422663bb5ec8cd84c5a8bdd0476bb95':
Allow AOSP to boot.
RoboErik [Thu, 25 Sep 2014 19:07:41 +0000 (19:07 +0000)]
am
54218f6b: am
10a7dfea: am
504752fb: Merge "Ensure MediaBrowser state is set to connecting after a reconnect" into lmp-dev
* commit '
54218f6b7e3c3cd426c91d263d85d20609e57382':
Ensure MediaBrowser state is set to connecting after a reconnect
RoboErik [Thu, 25 Sep 2014 19:07:37 +0000 (19:07 +0000)]
am
a59c7f03: am
dff59b8b: am
23df1c46: Merge "Allow null queues to be set in MediaSession" into lmp-dev
* commit '
a59c7f03a9db8af35fc37f5076054aab77cde887':
Allow null queues to be set in MediaSession
Dan Albert [Thu, 25 Sep 2014 19:00:34 +0000 (19:00 +0000)]
am
d7baaed8: Merge "Allow AOSP to boot."
* commit '
d7baaed89e498ad3cf7d9c487d6cae967e562ea4':
Allow AOSP to boot.
RoboErik [Thu, 25 Sep 2014 18:57:16 +0000 (18:57 +0000)]
am
10a7dfea: am
504752fb: Merge "Ensure MediaBrowser state is set to connecting after a reconnect" into lmp-dev
* commit '
10a7dfeab45c0687d7c866c78403ba6f8e53e624':
Ensure MediaBrowser state is set to connecting after a reconnect
RoboErik [Thu, 25 Sep 2014 18:57:13 +0000 (18:57 +0000)]
am
dff59b8b: am
23df1c46: Merge "Allow null queues to be set in MediaSession" into lmp-dev
* commit '
dff59b8b8c3735590aa84c0b5ee92c17459bd6b5':
Allow null queues to be set in MediaSession
Dan Albert [Thu, 25 Sep 2014 18:50:18 +0000 (18:50 +0000)]
Merge "Allow AOSP to boot."
Dan Albert [Thu, 25 Sep 2014 18:47:09 +0000 (11:47 -0700)]
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
Ye Wen [Thu, 25 Sep 2014 18:44:04 +0000 (18:44 +0000)]
am
272f2321: am
a0945b40: resolved conflicts for merge of
13ff7c17 to lmp-sprout-dev
* commit '
272f232181345089bd0f4a9b8356772204bcc0cb':
Hide carrier app intents in Telephony (1/2)
RoboErik [Thu, 25 Sep 2014 18:42:06 +0000 (18:42 +0000)]
am
504752fb: Merge "Ensure MediaBrowser state is set to connecting after a reconnect" into lmp-dev
* commit '
504752fb3833a90f4a226a2027939cb972cb8a9b':
Ensure MediaBrowser state is set to connecting after a reconnect
RoboErik [Thu, 25 Sep 2014 18:42:00 +0000 (18:42 +0000)]
am
23df1c46: Merge "Allow null queues to be set in MediaSession" into lmp-dev
* commit '
23df1c46b768bb2a1363b6f671b0d0c4879538b7':
Allow null queues to be set in MediaSession
RoboErik [Thu, 25 Sep 2014 18:28:49 +0000 (18:28 +0000)]
Merge "Ensure MediaBrowser state is set to connecting after a reconnect" into lmp-dev
RoboErik [Thu, 25 Sep 2014 18:28:20 +0000 (18:28 +0000)]
Merge "Allow null queues to be set in MediaSession" into lmp-dev
Junda Liu [Thu, 25 Sep 2014 18:27:58 +0000 (18:27 +0000)]
am
8e61b503: am
63f0b87e: am
96c54879: Merge "Hide CarrierPrivilege APIs in TelMgr." into lmp-dev
* commit '
8e61b5036f0c2479b9735255bb409601932806f0':
Hide CarrierPrivilege APIs in TelMgr.
Ye Wen [Thu, 25 Sep 2014 18:27:55 +0000 (18:27 +0000)]
am
a0945b40: resolved conflicts for merge of
13ff7c17 to lmp-sprout-dev
* commit '
a0945b409818052e8bc0e2a8711dbed6b2e56e33':
Hide carrier app intents in Telephony (1/2)
Ye Wen [Thu, 25 Sep 2014 18:20:08 +0000 (11:20 -0700)]
resolved conflicts for merge of
13ff7c17 to lmp-sprout-dev
Change-Id: Ic27b03fa49bb921c36cd2825bf5486903dfd0317
Junda Liu [Thu, 25 Sep 2014 18:17:52 +0000 (18:17 +0000)]
am
63f0b87e: am
96c54879: Merge "Hide CarrierPrivilege APIs in TelMgr." into lmp-dev
* commit '
63f0b87ee3a0df19eec15e73cfbfb9b97623534c':
Hide CarrierPrivilege APIs in TelMgr.
Chris Wren [Thu, 25 Sep 2014 17:52:38 +0000 (17:52 +0000)]
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.
Junda Liu [Thu, 25 Sep 2014 17:46:39 +0000 (17:46 +0000)]
am
96c54879: Merge "Hide CarrierPrivilege APIs in TelMgr." into lmp-dev
* commit '
96c548791145ab33ceb0935f38323d3182d44419':
Hide CarrierPrivilege APIs in TelMgr.
Chris Wren [Thu, 25 Sep 2014 17:41:24 +0000 (17:41 +0000)]
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.
Ye Wen [Thu, 25 Sep 2014 17:36:31 +0000 (17:36 +0000)]
Merge "Hide carrier app intents in Telephony (1/2)" into lmp-dev
Junda Liu [Thu, 25 Sep 2014 17:36:09 +0000 (17:36 +0000)]
Merge "Hide CarrierPrivilege APIs in TelMgr." into lmp-dev
Chris Wren [Thu, 25 Sep 2014 17:29:25 +0000 (17:29 +0000)]
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.
Junda Liu [Wed, 24 Sep 2014 19:53:36 +0000 (12:53 -0700)]
Hide CarrierPrivilege APIs in TelMgr.
Per API council decision, we will polish and public in MR1.
Bug: b/
17639966
Change-Id: Id009cd62b4d44dd17fe7a30e0f8037c6fb373c32
Chris Wren [Thu, 25 Sep 2014 17:21:31 +0000 (17:21 +0000)]
Merge "getCurrentInterruptionFilter should return the filter value, not the hints." into lmp-dev
Kenny Guy [Thu, 25 Sep 2014 17:12:02 +0000 (17:12 +0000)]
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
John Reck [Thu, 25 Sep 2014 17:06:22 +0000 (17:06 +0000)]
Christoph Studer [Thu, 25 Sep 2014 17:06:18 +0000 (17:06 +0000)]
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()
Ronghua Wu [Thu, 25 Sep 2014 17:06:13 +0000 (17:06 +0000)]
am
bf14a4e6: am
2f1e6478: am
5817765c: am
ca7f391e: Merge "MediaCodecList: fix findEncoderForFormat." into lmp-dev
* commit '
bf14a4e6ea6f2c70152a9456ed790fc460734e16':
MediaCodecList: fix findEncoderForFormat.
Sukanya Rajkhowa [Thu, 25 Sep 2014 17:06:09 +0000 (17:06 +0000)]
am
57674c99: am
518db096: am
5699372f: am
14cb7b8a: Add config to control phone switch
* commit '
57674c99243b51b13cbea48766e30e67cd9448d6':
Add config to control phone switch
Lajos Molnar [Thu, 25 Sep 2014 17:06:04 +0000 (17:06 +0000)]
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)
Andre Eisenbach [Thu, 25 Sep 2014 17:05:59 +0000 (17:05 +0000)]
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
Vinit Deshpande [Thu, 25 Sep 2014 17:05:55 +0000 (17:05 +0000)]
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
Lajos Molnar [Thu, 25 Sep 2014 17:05:47 +0000 (17:05 +0000)]
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
Jeff Sharkey [Thu, 25 Sep 2014 17:05:42 +0000 (17:05 +0000)]
am
1eb1a4fa: am
b47a75f2: am
b8bbeff0: am
45ef18b6: Merge "Include reason when wiping data." into lmp-dev
* commit '
1eb1a4fa28d74312b329daaecd8a81fcf367eea4':
Include reason when wiping data.
ztenghui [Thu, 25 Sep 2014 17:05:38 +0000 (17:05 +0000)]
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
ztenghui [Thu, 25 Sep 2014 17:05:34 +0000 (17:05 +0000)]
am
4706b24e: am
6bdc2e08: am
7ac0a907: am
c793e67c: Merge "Fix AVD for CTS failure." into lmp-dev
* commit '
4706b24e3d15b5b593a48658eab4af60df782a2e':
Fix AVD for CTS failure.
Kenny Guy [Thu, 25 Sep 2014 16:58:58 +0000 (16:58 +0000)]
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
John Reck [Thu, 25 Sep 2014 16:52:46 +0000 (16:52 +0000)]
am
4dd90969: am
2994cc57: am
e5831979: Missing null check
* commit '
4dd90969d755305a70aee8759cd0210a6b42c425':
Missing null check
Christoph Studer [Thu, 25 Sep 2014 16:52:42 +0000 (16:52 +0000)]
am
1c662485: am
d9ca58c6: am
78205c2b: Merge "NoMan: Add 3s timeout in matchesCallFilter()" into lmp-dev
* commit '
1c662485e4a3206e430eafa7300a0f63e2eb45da':
NoMan: Add 3s timeout in matchesCallFilter()
Ronghua Wu [Thu, 25 Sep 2014 16:52:22 +0000 (16:52 +0000)]
am
2f1e6478: am
5817765c: am
ca7f391e: Merge "MediaCodecList: fix findEncoderForFormat." into lmp-dev
* commit '
2f1e6478aeaedbcaa396760f2e9351c394a2e47f':
MediaCodecList: fix findEncoderForFormat.
Sukanya Rajkhowa [Thu, 25 Sep 2014 16:52:17 +0000 (16:52 +0000)]
am
518db096: am
5699372f: am
14cb7b8a: Add config to control phone switch
* commit '
518db096f4d8debe0d93f2c98dc9024e44d541d6':
Add config to control phone switch
Lajos Molnar [Thu, 25 Sep 2014 16:52:14 +0000 (16:52 +0000)]
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)
Kenny Guy [Thu, 25 Sep 2014 16:52:12 +0000 (16:52 +0000)]
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
Andre Eisenbach [Thu, 25 Sep 2014 16:52:10 +0000 (16:52 +0000)]
am
c9e7505a: am
630f9671: am
fe99f9f4: Merge "Remove remanents of onConnectionCongested in framwork" into lmp-dev
* commit '
c9e7505a0ab0ff337e09bed6afdeef86512cda5f':
Remove remanents of onConnectionCongested in framwork
Vinit Deshpande [Thu, 25 Sep 2014 16:52:07 +0000 (16:52 +0000)]
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
Lajos Molnar [Thu, 25 Sep 2014 16:52:03 +0000 (16:52 +0000)]
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
Jeff Sharkey [Thu, 25 Sep 2014 16:51:59 +0000 (16:51 +0000)]
am
b47a75f2: am
b8bbeff0: am
45ef18b6: Merge "Include reason when wiping data." into lmp-dev
* commit '
b47a75f227bd43f90c2f437ea991d5fa42603d04':
Include reason when wiping data.
ztenghui [Thu, 25 Sep 2014 16:51:54 +0000 (16:51 +0000)]
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
ztenghui [Thu, 25 Sep 2014 16:51:50 +0000 (16:51 +0000)]
am
6bdc2e08: am
7ac0a907: am
c793e67c: Merge "Fix AVD for CTS failure." into lmp-dev
* commit '
6bdc2e08b712f147e5aeec39afded3d723b8426c':
Fix AVD for CTS failure.
Kenny Guy [Thu, 25 Sep 2014 16:42:10 +0000 (16:42 +0000)]
Merge "Ignore badly formed ComponentNames when loading device_owner.xml" into lmp-dev
John Reck [Thu, 25 Sep 2014 16:38:37 +0000 (16:38 +0000)]
am
2994cc57: am
e5831979: Missing null check
* commit '
2994cc57444cc0ae83081f2324a5ce94ab58965a':
Missing null check
Christoph Studer [Thu, 25 Sep 2014 16:38:33 +0000 (16:38 +0000)]
am
d9ca58c6: am
78205c2b: Merge "NoMan: Add 3s timeout in matchesCallFilter()" into lmp-dev
* commit '
d9ca58c678082a62d62df92a4f0921aaef353894':
NoMan: Add 3s timeout in matchesCallFilter()
Ronghua Wu [Thu, 25 Sep 2014 16:38:30 +0000 (16:38 +0000)]
am
5817765c: am
ca7f391e: Merge "MediaCodecList: fix findEncoderForFormat." into lmp-dev
* commit '
5817765c034d41881ebfe72d7d6d0c81a2ed8e10':
MediaCodecList: fix findEncoderForFormat.
Sukanya Rajkhowa [Thu, 25 Sep 2014 16:38:26 +0000 (16:38 +0000)]
am
5699372f: am
14cb7b8a: Add config to control phone switch
* commit '
5699372fe72f36e3020464a687f1346f5f325ae6':
Add config to control phone switch
Lajos Molnar [Thu, 25 Sep 2014 16:38:23 +0000 (16:38 +0000)]
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)
Andre Eisenbach [Thu, 25 Sep 2014 16:38:19 +0000 (16:38 +0000)]
am
630f9671: am
fe99f9f4: Merge "Remove remanents of onConnectionCongested in framwork" into lmp-dev
* commit '
630f9671beae6a09e8a1fa315b632d292a83c4f0':
Remove remanents of onConnectionCongested in framwork
Vinit Deshpande [Thu, 25 Sep 2014 16:38:15 +0000 (16:38 +0000)]
am
0604f9b7: am
f9b8c88c: Merge "Introduce config setting for scanning mac OUI" into lmp-dev
* commit '
0604f9b7eaf51920c177f5af845bb254c3695074':
Introduce config setting for scanning mac OUI
Lajos Molnar [Thu, 25 Sep 2014 16:38:12 +0000 (16:38 +0000)]
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
Jeff Sharkey [Thu, 25 Sep 2014 16:38:08 +0000 (16:38 +0000)]
am
b8bbeff0: am
45ef18b6: Merge "Include reason when wiping data." into lmp-dev
* commit '
b8bbeff0796847bbe98deb2d84989b656356873c':
Include reason when wiping data.
ztenghui [Thu, 25 Sep 2014 16:38:05 +0000 (16:38 +0000)]
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
ztenghui [Thu, 25 Sep 2014 16:38:00 +0000 (16:38 +0000)]
am
7ac0a907: am
c793e67c: Merge "Fix AVD for CTS failure." into lmp-dev
* commit '
7ac0a907051287a9cb01b3b54332a7ba865102e6':
Fix AVD for CTS failure.
Ye Wen [Tue, 23 Sep 2014 17:24:57 +0000 (10:24 -0700)]
Hide carrier app intents in Telephony (1/2)
b/
17608135
Change-Id: Ib42d40cf8aac98f62c7237fa450463ff7c1a0f47
John Reck [Thu, 25 Sep 2014 16:24:33 +0000 (16:24 +0000)]
am
e5831979: Missing null check
* commit '
e58319791de1e47db1d6d3c6565f03a5f775a9cb':
Missing null check
Christoph Studer [Thu, 25 Sep 2014 16:24:22 +0000 (16:24 +0000)]
am
78205c2b: Merge "NoMan: Add 3s timeout in matchesCallFilter()" into lmp-dev
* commit '
78205c2b2e4f28cdafff93be2c599097b1b9f00d':
NoMan: Add 3s timeout in matchesCallFilter()
Ronghua Wu [Thu, 25 Sep 2014 16:23:16 +0000 (16:23 +0000)]
am
ca7f391e: Merge "MediaCodecList: fix findEncoderForFormat." into lmp-dev
* commit '
ca7f391e2b04a9efc4beb5f5b769653a983ff424':
MediaCodecList: fix findEncoderForFormat.
Sukanya Rajkhowa [Thu, 25 Sep 2014 16:23:11 +0000 (16:23 +0000)]
am
14cb7b8a: Add config to control phone switch
* commit '
14cb7b8aeb99d3337b191a49ab11eb8642cde5fa':
Add config to control phone switch
Lajos Molnar [Thu, 25 Sep 2014 16:23:07 +0000 (16:23 +0000)]
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)
Andre Eisenbach [Thu, 25 Sep 2014 16:22:45 +0000 (16:22 +0000)]
am
fe99f9f4: Merge "Remove remanents of onConnectionCongested in framwork" into lmp-dev
* commit '
fe99f9f42ad1a45922c906bacd5ea56d58667245':
Remove remanents of onConnectionCongested in framwork
Vinit Deshpande [Thu, 25 Sep 2014 16:22:40 +0000 (16:22 +0000)]
am
f9b8c88c: Merge "Introduce config setting for scanning mac OUI" into lmp-dev
* commit '
f9b8c88c6529daebe9676d7c440fcd3e478ec034':
Introduce config setting for scanning mac OUI
Lajos Molnar [Thu, 25 Sep 2014 16:22:31 +0000 (16:22 +0000)]
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
Jeff Sharkey [Thu, 25 Sep 2014 16:22:22 +0000 (16:22 +0000)]
am
45ef18b6: Merge "Include reason when wiping data." into lmp-dev
* commit '
45ef18b63e78fd853865f42d9369a5c9b4dd4ba0':
Include reason when wiping data.
ztenghui [Thu, 25 Sep 2014 16:22:10 +0000 (16:22 +0000)]
am
a00457a6: Merge "Add one more test and update old tests" into lmp-dev
* commit '
a00457a60160f27e15c9d75824057f7d914b7b7d':
Add one more test and update old tests
ztenghui [Thu, 25 Sep 2014 16:22:06 +0000 (16:22 +0000)]
am
c793e67c: Merge "Fix AVD for CTS failure." into lmp-dev
* commit '
c793e67ca93a1550fa68c887ef00d207ac1e1d84':
Fix AVD for CTS failure.
Evan Charlton [Thu, 25 Sep 2014 16:17:44 +0000 (16:17 +0000)]
am
11316e1c: am
8bc6212e: Merge "Revert "@hide ConnectionService APIs."" into lmp-mr1-dev
* commit '
11316e1c174ca781bea357b558a8d291fe7c18ba':
Revert "@hide ConnectionService APIs."
Evan Charlton [Thu, 25 Sep 2014 16:06:48 +0000 (16:06 +0000)]
am
8bc6212e: Merge "Revert "@hide ConnectionService APIs."" into lmp-mr1-dev
* commit '
8bc6212eeb926b1f00e73af924e1f072f99160b3':
Revert "@hide ConnectionService APIs."
Kenny Guy [Thu, 25 Sep 2014 14:40:51 +0000 (15:40 +0100)]
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
Evan Charlton [Thu, 25 Sep 2014 15:58:34 +0000 (15:58 +0000)]
Merge "Revert "@hide ConnectionService APIs."" into lmp-mr1-dev
John Reck [Thu, 25 Sep 2014 15:33:05 +0000 (08:33 -0700)]
Missing null check
Bug:
17642023
Change-Id: I874b76e1e184a59dec714191d759c1045b7b9814
Christoph Studer [Thu, 25 Sep 2014 10:53:46 +0000 (10:53 +0000)]
Merge "NoMan: Add 3s timeout in matchesCallFilter()" into lmp-dev
Ruben Brunk [Thu, 25 Sep 2014 10:24:12 +0000 (10:24 +0000)]
am
01105fee: am
ae7ff48d: am
6a7dcedf: am
8acfdc7b: Merge "camera2: Hide JPEGs in RGBA gralloc buffers." into lmp-dev
* commit '
01105feea74a4d0a063774509efa21ae95d50a3a':
camera2: Hide JPEGs in RGBA gralloc buffers.
Joe Fernandez [Thu, 25 Sep 2014 10:24:07 +0000 (10:24 +0000)]
am
4a6095c5: 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 '
4a6095c5ef87eb6c10b99829efd6a84fe9fc0c70':
docs: Update the staging app.yaml to be compatible with GAE 1.9.4 and higher
Ruben Brunk [Thu, 25 Sep 2014 10:14:07 +0000 (10:14 +0000)]
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.
Joe Fernandez [Thu, 25 Sep 2014 10:14:03 +0000 (10:14 +0000)]
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
Ruben Brunk [Thu, 25 Sep 2014 10:03:40 +0000 (10:03 +0000)]
am
6a7dcedf: am
8acfdc7b: Merge "camera2: Hide JPEGs in RGBA gralloc buffers." into lmp-dev
* commit '
6a7dcedf4f3a3af8ccbaebc9ec9dd02796d4e93e':
camera2: Hide JPEGs in RGBA gralloc buffers.
Joe Fernandez [Thu, 25 Sep 2014 10:03:37 +0000 (10:03 +0000)]
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
Ruben Brunk [Thu, 25 Sep 2014 09:51:33 +0000 (09:51 +0000)]
am
8acfdc7b: Merge "camera2: Hide JPEGs in RGBA gralloc buffers." into lmp-dev
* commit '
8acfdc7bf6b8ee5250351723ab2eef28f2b71e51':
camera2: Hide JPEGs in RGBA gralloc buffers.
Ronghua Wu [Thu, 25 Sep 2014 00:23:02 +0000 (00:23 +0000)]
Merge "MediaCodecList: fix findEncoderForFormat." into lmp-dev
Sukanya Rajkhowa [Mon, 15 Sep 2014 22:59:38 +0000 (15:59 -0700)]
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
Lajos Molnar [Thu, 25 Sep 2014 00:19:43 +0000 (00:19 +0000)]
Merge "MediaCodec: revalidate cached queued input buffers if queue fails (2)" into lmp-dev
Ronghua Wu [Wed, 24 Sep 2014 17:00:48 +0000 (10:00 -0700)]
MediaCodecList: fix findEncoderForFormat.
Bug:
17460057
Bug:
17637188
Change-Id: I618ff1a4dbbecf64786207ccb5208b0a67d80ddd
Andre Eisenbach [Wed, 24 Sep 2014 23:57:01 +0000 (23:57 +0000)]
Merge "Remove remanents of onConnectionCongested in framwork" into lmp-dev
Vinit Deshpande [Wed, 24 Sep 2014 23:50:04 +0000 (23:50 +0000)]
Merge "Introduce config setting for scanning mac OUI" into lmp-dev
Lajos Molnar [Wed, 24 Sep 2014 21:07:35 +0000 (14:07 -0700)]
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
OSDN Git Service
