OSDN Git Service
Svetoslav [Fri, 26 Sep 2014 00:25:26 +0000 (00:25 +0000)]
am
d46e5c59: am
5ec87159: am
09b81193: am
85daf4f0: Merge "Accessibility events may be fired even if no services observe them." into lmp-dev
* commit '
d46e5c59586f478ce1982a229751a3304f676005':
Accessibility events may be fired even if no services observe them.
Chris Wren [Fri, 26 Sep 2014 00:25:21 +0000 (00:25 +0000)]
am
7182e206: am
1f270a93: am
cf9ee933: am
2eb3b974: Merge "Allow longer translations in the notification actions." into lmp-dev
* commit '
7182e206d44120526f87e7d8d8996e4369626805':
Allow longer translations in the notification actions.
Ruben Brunk [Fri, 26 Sep 2014 00:25:16 +0000 (00:25 +0000)]
am
5e312018: am
be8900a9: am
4754428d: am
e76ce25f: Merge "camera2: Fix null check in PictureCallback." into lmp-dev
* commit '
5e312018e6188deb665a9a19950bad176345708a':
camera2: Fix null check in PictureCallback.
Amith Yamasani [Fri, 26 Sep 2014 00:25:12 +0000 (00:25 +0000)]
am
d3399218: am
89d8d175: am
158c51f3: am
95548b39: Merge "Fix GPS icon not showing for secondary users" into lmp-dev
* commit '
d3399218fb73f12efe308d9025b5f6ad26f474d5':
Fix GPS icon not showing for secondary users
John Spurlock [Fri, 26 Sep 2014 00:25:07 +0000 (00:25 +0000)]
am
1a0aba91: am
b1e369bc: am
37c874d0: am
0dccf597: Merge "Supertoast when user changes zen mode." into lmp-dev
* commit '
1a0aba91aefc4d95c831455bf4e91243ceb20c2e':
Supertoast when user changes zen mode.
Paul Lawrence [Fri, 26 Sep 2014 00:23:53 +0000 (00:23 +0000)]
am
98a18468: am
433d70d3: am
7c4b9413: am
56a38862: Merge "Fix pause when setting pin/pattern/password" into lmp-dev
* commit '
98a18468ef2f6ec7f46c21015c0d8df42ea86ff5':
Fix pause when setting pin/pattern/password
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
Svetoslav [Thu, 25 Sep 2014 22:03:09 +0000 (22:03 +0000)]
am
5ec87159: am
09b81193: am
85daf4f0: Merge "Accessibility events may be fired even if no services observe them." into lmp-dev
* commit '
5ec87159e8a2f33e583af20f1a2c06fcccf00c4a':
Accessibility events may be fired even if no services observe them.
Chris Wren [Thu, 25 Sep 2014 22:03:02 +0000 (22:03 +0000)]
am
1f270a93: am
cf9ee933: am
2eb3b974: Merge "Allow longer translations in the notification actions." into lmp-dev
* commit '
1f270a93d4ade45a0db694a5241518b9b4549400':
Allow longer translations in the notification actions.
Ruben Brunk [Thu, 25 Sep 2014 22:02:48 +0000 (22:02 +0000)]
am
be8900a9: am
4754428d: am
e76ce25f: Merge "camera2: Fix null check in PictureCallback." into lmp-dev
* commit '
be8900a96b72d26c987feb63432541f721c06c21':
camera2: Fix null check in PictureCallback.
Amith Yamasani [Thu, 25 Sep 2014 22:02:44 +0000 (22:02 +0000)]
am
89d8d175: am
158c51f3: am
95548b39: Merge "Fix GPS icon not showing for secondary users" into lmp-dev
* commit '
89d8d175e522f4a8ce77fb3996841d5349162243':
Fix GPS icon not showing for secondary users
John Spurlock [Thu, 25 Sep 2014 22:02:34 +0000 (22:02 +0000)]
am
b1e369bc: am
37c874d0: am
0dccf597: Merge "Supertoast when user changes zen mode." into lmp-dev
* commit '
b1e369bca1370f6449a53808d4aae71eda9a1ab6':
Supertoast when user changes zen mode.
Svetoslav [Thu, 25 Sep 2014 20:26:15 +0000 (20:26 +0000)]
am
09b81193: am
85daf4f0: Merge "Accessibility events may be fired even if no services observe them." into lmp-dev
* commit '
09b811936d5e6c16f8be5ce4921c40ec0f298d29':
Accessibility events may be fired even if no services observe them.
Svetoslav [Thu, 25 Sep 2014 20:14:25 +0000 (20:14 +0000)]
am
85daf4f0: Merge "Accessibility events may be fired even if no services observe them." into lmp-dev
* commit '
85daf4f04ade8a5d85eab70e63cd184dcb760501':
Accessibility events may be fired even if no services observe them.
Chris Wren [Thu, 25 Sep 2014 20:12:44 +0000 (20:12 +0000)]
am
cf9ee933: am
2eb3b974: Merge "Allow longer translations in the notification actions." into lmp-dev
* commit '
cf9ee9338a7f9972288b5104ee432e8c8cabb46e':
Allow longer translations in the notification actions.
Svetoslav [Thu, 25 Sep 2014 20:06:19 +0000 (20:06 +0000)]
Merge "Accessibility events may be fired even if no services observe them." into lmp-dev
Chris Wren [Thu, 25 Sep 2014 19:59:06 +0000 (19:59 +0000)]
am
2eb3b974: Merge "Allow longer translations in the notification actions." into lmp-dev
* commit '
2eb3b974ab5c1f7f1ca79410ea54026f58e35c07':
Allow longer translations in the notification actions.
Chris Wren [Thu, 25 Sep 2014 19:50:32 +0000 (19:50 +0000)]
Merge "Allow longer translations in the notification actions." into lmp-dev
Ruben Brunk [Thu, 25 Sep 2014 19:40:58 +0000 (19:40 +0000)]
am
4754428d: am
e76ce25f: Merge "camera2: Fix null check in PictureCallback." into lmp-dev
* commit '
4754428da2cc3e1224fc6f227ac831fee90c8b96':
camera2: Fix null check in PictureCallback.
Amith Yamasani [Thu, 25 Sep 2014 19:40:54 +0000 (19:40 +0000)]
am
158c51f3: am
95548b39: Merge "Fix GPS icon not showing for secondary users" into lmp-dev
* commit '
158c51f3b84f8870d562e12fcd6b1ba672348fd9':
Fix GPS icon not showing for secondary users
John Spurlock [Thu, 25 Sep 2014 19:33:12 +0000 (19:33 +0000)]
am
37c874d0: am
0dccf597: Merge "Supertoast when user changes zen mode." into lmp-dev
* commit '
37c874d0826dfe0142a317b4d7e0e0bf7b53ec17':
Supertoast when user changes zen mode.
Ruben Brunk [Thu, 25 Sep 2014 19:29:40 +0000 (19:29 +0000)]
am
e76ce25f: Merge "camera2: Fix null check in PictureCallback." into lmp-dev
* commit '
e76ce25ff342d393ffb79ef7e01b09cae5320a73':
camera2: Fix null check in PictureCallback.
Amith Yamasani [Thu, 25 Sep 2014 19:29:36 +0000 (19:29 +0000)]
am
95548b39: Merge "Fix GPS icon not showing for secondary users" into lmp-dev
* commit '
95548b395d681b0ecfef341058f282f624ae3862':
Fix GPS icon not showing for secondary users
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.
Ruben Brunk [Thu, 25 Sep 2014 19:22:59 +0000 (19:22 +0000)]
Merge "camera2: Fix null check in PictureCallback." into lmp-dev
John Spurlock [Thu, 25 Sep 2014 19:19:45 +0000 (19:19 +0000)]
am
0dccf597: Merge "Supertoast when user changes zen mode." into lmp-dev
* commit '
0dccf597f10fd0dc755f42514c470d447c820b20':
Supertoast when user changes zen mode.
Amith Yamasani [Thu, 25 Sep 2014 19:18:23 +0000 (19:18 +0000)]
Merge "Fix GPS icon not showing for secondary users" into lmp-dev
John Spurlock [Thu, 25 Sep 2014 19:08:39 +0000 (19:08 +0000)]
Merge "Supertoast when user changes zen mode." into lmp-dev
Paul Lawrence [Thu, 25 Sep 2014 19:07:45 +0000 (19:07 +0000)]
am
433d70d3: am
7c4b9413: am
56a38862: Merge "Fix pause when setting pin/pattern/password" into lmp-dev
* commit '
433d70d348a21a9f2f15c5357a14c3955b751915':
Fix pause when setting pin/pattern/password
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
John Spurlock [Tue, 23 Sep 2014 18:59:51 +0000 (14:59 -0400)]
Supertoast when user changes zen mode.
If the user selects a new zen mode, display a quick toast
with the mode icon + text to aid in association.
Also fix a recent regression in the zen subhead alignment.
Bug:
16215680
Bug:
17641211
Change-Id: I4ead88d81be4d9c26459aed82c47b8c2fb32eafa
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.
Paul Lawrence [Thu, 25 Sep 2014 18:57:20 +0000 (18:57 +0000)]
am
7c4b9413: am
56a38862: Merge "Fix pause when setting pin/pattern/password" into lmp-dev
* commit '
7c4b941336300efc04e8842dc21a24f1c17bf345':
Fix pause when setting pin/pattern/password
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."
Ruben Brunk [Thu, 25 Sep 2014 18:48:27 +0000 (11:48 -0700)]
camera2: Fix null check in PictureCallback.
Bug:
17636586
Change-Id: Ieddc106e14c97dc78405821e83e346d626127e2c
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)
Paul Lawrence [Thu, 25 Sep 2014 18:42:10 +0000 (18:42 +0000)]
am
56a38862: Merge "Fix pause when setting pin/pattern/password" into lmp-dev
* commit '
56a38862d68c3160ae9b049ca89422cc5834e8e3':
Fix pause when setting pin/pattern/password
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
Paul Lawrence [Thu, 25 Sep 2014 18:33:53 +0000 (18:33 +0000)]
Merge "Fix pause when setting pin/pattern/password" into lmp-dev
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.
Chris Wren [Thu, 25 Sep 2014 17:38:39 +0000 (13:38 -0400)]
Allow longer translations in the notification actions.
Bug:
17345743
Change-Id: Icd0588516cb568ea76e2766f54ba1a61a8f3d997
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
Paul Lawrence [Thu, 25 Sep 2014 16:26:34 +0000 (09:26 -0700)]
Fix pause when setting pin/pattern/password
Move setting encryption pin/pattern/password into a separate thread
Bug:
17554587
Change-Id: Ifdf2ed5aa9ca08d68bb2ed08c8985203c24dcb9f
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.
OSDN Git Service
