OSDN Git Service
Dianne Hackborn [Tue, 4 Aug 2015 01:30:52 +0000 (01:30 +0000)]
am
24922798: am
b20a8ed9: am
d9b0f843: Merge "Fix issue #
22860466: viapi security bug - rubber stamping in nested VIs" into mnc-dev
* commit '
2492279816d41770f802835efdbc1169b00834bd':
Fix issue #
22860466: viapi security bug - rubber stamping in nested VIs
Dianne Hackborn [Tue, 4 Aug 2015 01:19:55 +0000 (01:19 +0000)]
am
b20a8ed9: am
d9b0f843: Merge "Fix issue #
22860466: viapi security bug - rubber stamping in nested VIs" into mnc-dev
* commit '
b20a8ed952e703801eebde2e6d9280b5bac0a689':
Fix issue #
22860466: viapi security bug - rubber stamping in nested VIs
Prem Kumar [Tue, 4 Aug 2015 01:18:12 +0000 (01:18 +0000)]
am
54c7ddbc: am
482ba343: am
04e2cf6b: Merge "Make default selection for contact sharing to "Checked"." into mnc-dev
* commit '
54c7ddbccd71c387c75deb36777b4aede8f226a1':
Make default selection for contact sharing to "Checked".
Wale Ogunwale [Tue, 4 Aug 2015 01:18:06 +0000 (01:18 +0000)]
am
26e11906: am
ce8921c3: am
911bd0d3: Merge "Set broadcast nextReceiver correctly when package is disabled" into mnc-dev
* commit '
26e11906781234e5a95bf536f1049c58c244a924':
Set broadcast nextReceiver correctly when package is disabled
John Reck [Tue, 4 Aug 2015 01:18:00 +0000 (01:18 +0000)]
am
0c9ec1f2: am
2e529712: am
c03ab87a: Merge "Disable skipping frames on empty damage" into mnc-dev
* commit '
0c9ec1f2b79835360b82b8cc91801a46c4352440':
Disable skipping frames on empty damage
Svetoslav Ganov [Tue, 4 Aug 2015 01:17:54 +0000 (01:17 +0000)]
am
db67d5b7: am
ba6cdbfd: am
ac8c9861: Merge "Notify settings URI change without a lock held" into mnc-dev
* commit '
db67d5b79ab2da6d8b8a1211b354687fb7930744':
Notify settings URI change without a lock held
Dianne Hackborn [Tue, 4 Aug 2015 01:17:46 +0000 (01:17 +0000)]
am
5dd9ef04: am
b0bc8368: am
3011f645: Merge "Fix issue #
22912704: "android.process.acore has stopped" dialog keeps popping up" into mnc-dev
* commit '
5dd9ef044cd15b728bf58d1f612f6956077bd709':
Fix issue #
22912704: "android.process.acore has stopped" dialog keeps popping up
John Reck [Tue, 4 Aug 2015 01:17:37 +0000 (01:17 +0000)]
am
8e645d58: am
649c3c44: am
7290d93d: Merge "Yell loudly about undefined behind in Bitmap, but work anyway" into mnc-dev
* commit '
8e645d58f1476eca5ca8871bc348047e1c188c4f':
Yell loudly about undefined behind in Bitmap, but work anyway
Jeff Sharkey [Tue, 4 Aug 2015 01:17:29 +0000 (01:17 +0000)]
am
cdd4cfb9: am
d4842c37: am
0faca96f: Merge "Avoid deadlock by broadcasting outside lock." into mnc-dev
* commit '
cdd4cfb95616c725d483d265e1aecd740ef0a8a5':
Avoid deadlock by broadcasting outside lock.
Dianne Hackborn [Tue, 4 Aug 2015 01:12:33 +0000 (01:12 +0000)]
am
d9b0f843: Merge "Fix issue #
22860466: viapi security bug - rubber stamping in nested VIs" into mnc-dev
* commit '
d9b0f8435ba9b099512288729af24858a95fd013':
Fix issue #
22860466: viapi security bug - rubber stamping in nested VIs
Prem Kumar [Tue, 4 Aug 2015 01:09:20 +0000 (01:09 +0000)]
am
482ba343: am
04e2cf6b: Merge "Make default selection for contact sharing to "Checked"." into mnc-dev
* commit '
482ba34383796d87e4832ace98b0bb1934c8ef72':
Make default selection for contact sharing to "Checked".
Wale Ogunwale [Tue, 4 Aug 2015 01:09:16 +0000 (01:09 +0000)]
am
ce8921c3: am
911bd0d3: Merge "Set broadcast nextReceiver correctly when package is disabled" into mnc-dev
* commit '
ce8921c3c02b88fcf940e085ac34f3933f5522ac':
Set broadcast nextReceiver correctly when package is disabled
John Reck [Tue, 4 Aug 2015 01:09:12 +0000 (01:09 +0000)]
am
2e529712: am
c03ab87a: Merge "Disable skipping frames on empty damage" into mnc-dev
* commit '
2e529712e67b94aefec81d0e081f9c34c4fef3f7':
Disable skipping frames on empty damage
Svetoslav Ganov [Tue, 4 Aug 2015 01:09:07 +0000 (01:09 +0000)]
am
ba6cdbfd: am
ac8c9861: Merge "Notify settings URI change without a lock held" into mnc-dev
* commit '
ba6cdbfdbbbb6f83052e895a698fcc0d71793b25':
Notify settings URI change without a lock held
Dianne Hackborn [Tue, 4 Aug 2015 01:09:02 +0000 (01:09 +0000)]
am
b0bc8368: am
3011f645: Merge "Fix issue #
22912704: "android.process.acore has stopped" dialog keeps popping up" into mnc-dev
* commit '
b0bc8368f53e80236026e54311f2dda7b662c664':
Fix issue #
22912704: "android.process.acore has stopped" dialog keeps popping up
John Reck [Tue, 4 Aug 2015 01:08:58 +0000 (01:08 +0000)]
am
649c3c44: am
7290d93d: Merge "Yell loudly about undefined behind in Bitmap, but work anyway" into mnc-dev
* commit '
649c3c440e97f94971f5f2c8c4b08338c785c582':
Yell loudly about undefined behind in Bitmap, but work anyway
Jeff Sharkey [Tue, 4 Aug 2015 01:08:54 +0000 (01:08 +0000)]
am
d4842c37: am
0faca96f: Merge "Avoid deadlock by broadcasting outside lock." into mnc-dev
* commit '
d4842c374ab8f5578c8faca5a7e3f8d90bd7fab3':
Avoid deadlock by broadcasting outside lock.
Dianne Hackborn [Tue, 4 Aug 2015 01:07:36 +0000 (01:07 +0000)]
Merge "Fix issue #
22860466: viapi security bug - rubber stamping in nested VIs" into mnc-dev
Prem Kumar [Tue, 4 Aug 2015 01:00:47 +0000 (01:00 +0000)]
am
04e2cf6b: Merge "Make default selection for contact sharing to "Checked"." into mnc-dev
* commit '
04e2cf6bc5167583d686c2a118ec2b50a7b88547':
Make default selection for contact sharing to "Checked".
Wale Ogunwale [Tue, 4 Aug 2015 01:00:38 +0000 (01:00 +0000)]
am
911bd0d3: Merge "Set broadcast nextReceiver correctly when package is disabled" into mnc-dev
* commit '
911bd0d3a587a9a58e2bc1cf59615b039ea0e5b2':
Set broadcast nextReceiver correctly when package is disabled
John Reck [Tue, 4 Aug 2015 01:00:24 +0000 (01:00 +0000)]
am
c03ab87a: Merge "Disable skipping frames on empty damage" into mnc-dev
* commit '
c03ab87ac9f721ff22bfe5e9c0cd0e5be64f261e':
Disable skipping frames on empty damage
Svetoslav Ganov [Tue, 4 Aug 2015 01:00:17 +0000 (01:00 +0000)]
am
ac8c9861: Merge "Notify settings URI change without a lock held" into mnc-dev
* commit '
ac8c98614cb8260615795b2042699d93b21a1097':
Notify settings URI change without a lock held
Dianne Hackborn [Tue, 4 Aug 2015 01:00:12 +0000 (01:00 +0000)]
am
3011f645: Merge "Fix issue #
22912704: "android.process.acore has stopped" dialog keeps popping up" into mnc-dev
* commit '
3011f645abe8f976af6f876579a179d51c09bf30':
Fix issue #
22912704: "android.process.acore has stopped" dialog keeps popping up
John Reck [Tue, 4 Aug 2015 01:00:04 +0000 (01:00 +0000)]
am
7290d93d: Merge "Yell loudly about undefined behind in Bitmap, but work anyway" into mnc-dev
* commit '
7290d93df99de9d21ac8a9ddf72bc095b319af4b':
Yell loudly about undefined behind in Bitmap, but work anyway
Jeff Sharkey [Tue, 4 Aug 2015 00:59:58 +0000 (00:59 +0000)]
am
0faca96f: Merge "Avoid deadlock by broadcasting outside lock." into mnc-dev
* commit '
0faca96f939b8530e5387a30e317d852f39f689f':
Avoid deadlock by broadcasting outside lock.
Prem Kumar [Tue, 4 Aug 2015 00:41:46 +0000 (00:41 +0000)]
Merge "Make default selection for contact sharing to "Checked"." into mnc-dev
Wale Ogunwale [Tue, 4 Aug 2015 00:33:48 +0000 (00:33 +0000)]
Merge "Set broadcast nextReceiver correctly when package is disabled" into mnc-dev
Dianne Hackborn [Tue, 4 Aug 2015 00:14:46 +0000 (17:14 -0700)]
Fix issue #
22860466: viapi security bug - rubber stamping in nested VIs
Add new Activity.isVoiceInteractionRoot() API that an activity can use
to determine whether it is the root activity of a voice interaction
session started by the user's designated voice interaction service.
This is a special new API that apps must explicitly check, because as
with visual activities the model behind an activity should usually be
that it accomplishes its task by interacting with the user (implicitly
getting their approval) rather than trusting that whoever invoked it
is telling it to do what the user once. In the voice world, however,
there are some cases where quick interactions want to allow for immediate
execution without further user involvement, so this API allows for that
without opening up security holes from other applications.
Change-Id: Ie02d2458f16cb0b12af825641bcf8beaf086931b
Wale Ogunwale [Mon, 3 Aug 2015 22:21:44 +0000 (15:21 -0700)]
Set broadcast nextReceiver correctly when package is disabled
When we are cleaning up broadcat receivers due to a package been
disabled, it is possible to remove enough recievers to cause the
nextReceiver index to be greater than the size of recievers list.
We now set the nextReceiver to the size of the receiver list
(which means done processing) for this case.
Bug:
22874330
Change-Id: Ie151d1b5bff4c11533b3a8635fe5ee82eb21c13c
John Reck [Mon, 3 Aug 2015 23:33:13 +0000 (23:33 +0000)]
Merge "Disable skipping frames on empty damage" into mnc-dev
Svetoslav Ganov [Mon, 3 Aug 2015 23:15:16 +0000 (23:15 +0000)]
Merge "Notify settings URI change without a lock held" into mnc-dev
Dianne Hackborn [Mon, 3 Aug 2015 23:10:07 +0000 (23:10 +0000)]
Merge "Fix issue #
22912704: "android.process.acore has stopped" dialog keeps popping up" into mnc-dev
Svetoslav [Mon, 3 Aug 2015 23:02:52 +0000 (16:02 -0700)]
Notify settings URI change without a lock held
bug:
22469552
Change-Id: Ie4a42ceef07e3a8e593fe2b1374420239242ce7b
John Reck [Mon, 3 Aug 2015 22:50:25 +0000 (22:50 +0000)]
Merge "Yell loudly about undefined behind in Bitmap, but work anyway" into mnc-dev
John Reck [Mon, 3 Aug 2015 22:34:52 +0000 (15:34 -0700)]
Disable skipping frames on empty damage
Bug:
22592975
Optimization added in MNC is not quite correct, occasionally
it will fail to repaint when it was supposed to leading
to buffer corruption. Disable the optimization for now.
Change-Id: I34dfdfb357eda298198043ded7335d4588a003fd
Jeff Sharkey [Mon, 3 Aug 2015 22:32:36 +0000 (22:32 +0000)]
Merge "Avoid deadlock by broadcasting outside lock." into mnc-dev
Dianne Hackborn [Mon, 3 Aug 2015 22:28:28 +0000 (15:28 -0700)]
Fix issue #
22912704: "android.process.acore has stopped" dialog keeps popping up
Slice 'em up!
Change-Id: Ibba3af7ec5b7f92e6d5e55a57aa838a7f7f936e1
Diego Perez [Mon, 3 Aug 2015 21:54:05 +0000 (21:54 +0000)]
am
616ae85e: am
126973d4: am
405eceb2: Merge "Restore session params "no decoration" flag" into mnc-dev
* commit '
616ae85e83ba00aab8ec8bf0731a4dee1734823c':
Restore session params "no decoration" flag
Deepanshu Gupta [Mon, 3 Aug 2015 21:53:59 +0000 (21:53 +0000)]
am
33bdfe75: am
df776b76: am
d985e3b6: Merge changes Ib5f53f3b,I7debf3ee,Ic494ee7f,Ia8d223ae,Iff7dbbf6 into mnc-dev
* commit '
33bdfe75c7f7cab933ace382dcaa7d2c4d245dad':
Revert to using AppTheme for LayoutLib tests.
Fix Matrix_Delegate.native_getValues()
Update test image for upated nav icons.
Fix typo: s/FullScreen/Fullscreen/ in LayoutLib.
Fix bugs introduced in
78aa664.
Diego Perez [Mon, 3 Aug 2015 21:50:47 +0000 (21:50 +0000)]
am
126973d4: am
405eceb2: Merge "Restore session params "no decoration" flag" into mnc-dev
* commit '
126973d460a90c5cac90cf6dffee002e6248122c':
Restore session params "no decoration" flag
Deepanshu Gupta [Mon, 3 Aug 2015 21:45:29 +0000 (21:45 +0000)]
am
df776b76: am
d985e3b6: Merge changes Ib5f53f3b,I7debf3ee,Ic494ee7f,Ia8d223ae,Iff7dbbf6 into mnc-dev
* commit '
df776b761dfd74d11fb4ccb4355a53a717694cc5':
Revert to using AppTheme for LayoutLib tests.
Fix Matrix_Delegate.native_getValues()
Update test image for upated nav icons.
Fix typo: s/FullScreen/Fullscreen/ in LayoutLib.
Fix bugs introduced in
78aa664.
Diego Perez [Mon, 3 Aug 2015 21:43:31 +0000 (21:43 +0000)]
am
405eceb2: Merge "Restore session params "no decoration" flag" into mnc-dev
* commit '
405eceb20a3f3e7a22d922fc2d0fb8283be337fa':
Restore session params "no decoration" flag
Jeff Sharkey [Mon, 3 Aug 2015 21:41:13 +0000 (14:41 -0700)]
Avoid deadlock by broadcasting outside lock.
We can end up in a rare tangled mess when sending broadcasts while
PackageManager is still trying to deal with scanAvailableAsecs().
Long-term solution is to make Environment.isExternalStorageEmulated()
more robust, but for now we just send these internal broadcasts
after we drop the MountService lock.
Bug:
22858403
Change-Id: I7b43865782f48a679882fd1675b7b961e1292df4
Deepanshu Gupta [Mon, 3 Aug 2015 21:34:17 +0000 (21:34 +0000)]
am
d985e3b6: Merge changes Ib5f53f3b,I7debf3ee,Ic494ee7f,Ia8d223ae,Iff7dbbf6 into mnc-dev
* commit '
d985e3b61990837711d1f26def51caa76b9be473':
Revert to using AppTheme for LayoutLib tests.
Fix Matrix_Delegate.native_getValues()
Update test image for upated nav icons.
Fix typo: s/FullScreen/Fullscreen/ in LayoutLib.
Fix bugs introduced in
78aa664.
Diego Perez [Mon, 3 Aug 2015 21:33:24 +0000 (21:33 +0000)]
Merge "Restore session params "no decoration" flag" into mnc-dev
Deepanshu Gupta [Mon, 3 Aug 2015 21:27:50 +0000 (21:27 +0000)]
Merge changes Ib5f53f3b,I7debf3ee,Ic494ee7f,Ia8d223ae,Iff7dbbf6 into mnc-dev
* changes:
Revert to using AppTheme for LayoutLib tests.
Fix Matrix_Delegate.native_getValues()
Update test image for upated nav icons.
Fix typo: s/FullScreen/Fullscreen/ in LayoutLib.
Fix bugs introduced in
78aa664.
Jeff Sharkey [Mon, 3 Aug 2015 21:17:13 +0000 (21:17 +0000)]
am
b1e54abd: am
591ab090: am
3ba2bfa7: Merge "Expand ringtone titles to support OGG and FLAC." into mnc-dev
* commit '
b1e54abdbe3257999e017b972606996417a960a8':
Expand ringtone titles to support OGG and FLAC.
Jeff Sharkey [Mon, 3 Aug 2015 21:10:34 +0000 (21:10 +0000)]
am
591ab090: am
3ba2bfa7: Merge "Expand ringtone titles to support OGG and FLAC." into mnc-dev
* commit '
591ab090f65c63b686607a9370d1bfd0728479bb':
Expand ringtone titles to support OGG and FLAC.
Jeff Sharkey [Mon, 3 Aug 2015 21:01:34 +0000 (21:01 +0000)]
am
3ba2bfa7: Merge "Expand ringtone titles to support OGG and FLAC." into mnc-dev
* commit '
3ba2bfa7b280bac76d4d60a7f548c5e06aaca569':
Expand ringtone titles to support OGG and FLAC.
John Reck [Fri, 31 Jul 2015 20:10:39 +0000 (13:10 -0700)]
Yell loudly about undefined behind in Bitmap, but work anyway
Bug:
22214367
Previous releases would let the getters on a recycle()'d bitmap to still
work despite being firmly in undefined behavior per the documentation
on Bitmap#recycle().
As there are apps relying on this, yell very loudly about this behavior
in the log and give them a bit of time to fix it
Change-Id: I857be7e74cb217877973d9c6f03eb761d12fd056
Wale Ogunwale [Mon, 3 Aug 2015 20:56:30 +0000 (20:56 +0000)]
am
fa4c9f7a: am
5e4be98e: am
f8576979: Merge "Also consider task intent when trimming recent tasks" into mnc-dev
* commit '
fa4c9f7acddce51b6524b696c8ca22ffbb694da9':
Also consider task intent when trimming recent tasks
Jeff Sharkey [Mon, 3 Aug 2015 20:54:32 +0000 (20:54 +0000)]
Merge "Expand ringtone titles to support OGG and FLAC." into mnc-dev
Jeff Sharkey [Mon, 3 Aug 2015 20:25:24 +0000 (13:25 -0700)]
Expand ringtone titles to support OGG and FLAC.
These file types don't have "audio/" MIME type, so check for those
MIME types explicitly.
Bug:
22803550
Change-Id: Ia62f94ad4a19409d6a50462935de005bc572f93a
Alan Viverette [Mon, 3 Aug 2015 20:50:58 +0000 (20:50 +0000)]
am
66dd6ee9: am
e0d8a6ff: am
7b4170fa: Merge "Update Material link text to be colorAccent" into mnc-dev
* commit '
66dd6ee9cb5303d064f16fc4a7b1899d6c6f4eb8':
Update Material link text to be colorAccent
Jim Miller [Mon, 3 Aug 2015 20:50:52 +0000 (20:50 +0000)]
am
d14fa9b4: am
3f9b9f2b: am
45fcaa54: Merge "Don\'t wipe device because of short PIN, patterns or passwords" into mnc-dev
* commit '
d14fa9b4158979afb4a43e2ea572a216ca5dc8d4':
Don't wipe device because of short PIN, patterns or passwords
Wale Ogunwale [Mon, 3 Aug 2015 20:47:32 +0000 (20:47 +0000)]
am
5e4be98e: am
f8576979: Merge "Also consider task intent when trimming recent tasks" into mnc-dev
* commit '
5e4be98e40191439ef256affe2e660dbaafd0675':
Also consider task intent when trimming recent tasks
Alan Viverette [Mon, 3 Aug 2015 20:43:00 +0000 (20:43 +0000)]
am
5c8a5d0f: am
ce337493: am
ef3f58e5: Merge "Make ResolverDrawerLayout look like a ScrollView to accessibility" into mnc-dev
* commit '
5c8a5d0ff4493e32e9cd2127591a707637caf16a':
Make ResolverDrawerLayout look like a ScrollView to accessibility
Alan Viverette [Mon, 3 Aug 2015 20:42:54 +0000 (20:42 +0000)]
am
a2db7e68: am
42c9b35f: am
e76bf46a: Merge "Add badge content description to TargetInfo, use in ResolverActivity" into mnc-dev
* commit '
a2db7e68c95c8dbb498510774e492c13aa4bfbc9':
Add badge content description to TargetInfo, use in ResolverActivity
Alan Viverette [Mon, 3 Aug 2015 20:41:56 +0000 (20:41 +0000)]
am
e0d8a6ff: am
7b4170fa: Merge "Update Material link text to be colorAccent" into mnc-dev
* commit '
e0d8a6ff60e253fe29083a29bc00e1839953bc4f':
Update Material link text to be colorAccent
Jim Miller [Mon, 3 Aug 2015 20:41:52 +0000 (20:41 +0000)]
am
3f9b9f2b: am
45fcaa54: Merge "Don\'t wipe device because of short PIN, patterns or passwords" into mnc-dev
* commit '
3f9b9f2bbe81e25cfc2754e19a129895f8ad1011':
Don't wipe device because of short PIN, patterns or passwords
Wale Ogunwale [Mon, 3 Aug 2015 20:39:46 +0000 (20:39 +0000)]
am
f8576979: Merge "Also consider task intent when trimming recent tasks" into mnc-dev
* commit '
f85769797e14f0d10dcc99d695c6dee1eb56bd9c':
Also consider task intent when trimming recent tasks
Alan Viverette [Mon, 3 Aug 2015 20:36:38 +0000 (20:36 +0000)]
am
ce337493: am
ef3f58e5: Merge "Make ResolverDrawerLayout look like a ScrollView to accessibility" into mnc-dev
* commit '
ce337493fda60ac571287d011f9821d33b2caeb6':
Make ResolverDrawerLayout look like a ScrollView to accessibility
Alan Viverette [Mon, 3 Aug 2015 20:36:33 +0000 (20:36 +0000)]
am
42c9b35f: am
e76bf46a: Merge "Add badge content description to TargetInfo, use in ResolverActivity" into mnc-dev
* commit '
42c9b35fa293589b63c847ad9399ba8648ca7fb2':
Add badge content description to TargetInfo, use in ResolverActivity
Alan Viverette [Mon, 3 Aug 2015 20:33:05 +0000 (20:33 +0000)]
am
7b4170fa: Merge "Update Material link text to be colorAccent" into mnc-dev
* commit '
7b4170fa7f944e4cd73f1e82b56b4467de60d96c':
Update Material link text to be colorAccent
Jim Miller [Mon, 3 Aug 2015 20:33:00 +0000 (20:33 +0000)]
am
45fcaa54: Merge "Don\'t wipe device because of short PIN, patterns or passwords" into mnc-dev
* commit '
45fcaa547dc5b9eb2c20879b290415daa1446004':
Don't wipe device because of short PIN, patterns or passwords
Wale Ogunwale [Mon, 3 Aug 2015 20:31:31 +0000 (20:31 +0000)]
Merge "Also consider task intent when trimming recent tasks" into mnc-dev
Alan Viverette [Mon, 3 Aug 2015 20:27:17 +0000 (20:27 +0000)]
Merge "Update Material link text to be colorAccent" into mnc-dev
Alan Viverette [Mon, 3 Aug 2015 20:26:58 +0000 (20:26 +0000)]
am
ef3f58e5: Merge "Make ResolverDrawerLayout look like a ScrollView to accessibility" into mnc-dev
* commit '
ef3f58e59ba44b2679e98ccb46d588eba2c99cac':
Make ResolverDrawerLayout look like a ScrollView to accessibility
Alan Viverette [Mon, 3 Aug 2015 20:26:51 +0000 (20:26 +0000)]
am
e76bf46a: Merge "Add badge content description to TargetInfo, use in ResolverActivity" into mnc-dev
* commit '
e76bf46ab9d59592a06fbb3fcff826a50d548b9f':
Add badge content description to TargetInfo, use in ResolverActivity
Jim Miller [Mon, 3 Aug 2015 20:25:00 +0000 (20:25 +0000)]
Merge "Don't wipe device because of short PIN, patterns or passwords" into mnc-dev
Billy Lau [Mon, 3 Aug 2015 20:19:03 +0000 (20:19 +0000)]
am
8b095b1c: am
f83e8526: am
5680f9f6: Merge "Bug:
22879202 App compatibility with WRITE_SETTINGS failing" into mnc-dev
* commit '
8b095b1c19ac9316c649a0831383e9956ccc61d1':
Bug:
22879202 App compatibility with WRITE_SETTINGS failing
Alan Viverette [Mon, 3 Aug 2015 20:17:57 +0000 (20:17 +0000)]
Merge "Make ResolverDrawerLayout look like a ScrollView to accessibility" into mnc-dev
Alan Viverette [Mon, 3 Aug 2015 20:17:31 +0000 (20:17 +0000)]
Merge "Add badge content description to TargetInfo, use in ResolverActivity" into mnc-dev
Billy Lau [Mon, 3 Aug 2015 20:09:09 +0000 (20:09 +0000)]
am
f83e8526: am
5680f9f6: Merge "Bug:
22879202 App compatibility with WRITE_SETTINGS failing" into mnc-dev
* commit '
f83e852661e9e42087e48af3010b210474349f33':
Bug:
22879202 App compatibility with WRITE_SETTINGS failing
Svetoslav Ganov [Mon, 3 Aug 2015 20:05:47 +0000 (20:05 +0000)]
am
9fdf4e1b: am
688efe5d: am
87920455: Merge "Fix NPE in AppOpsService" into mnc-dev
* commit '
9fdf4e1b576ab5ace89ed817467879afbdadc322':
Fix NPE in AppOpsService
Svetoslav Ganov [Mon, 3 Aug 2015 20:05:42 +0000 (20:05 +0000)]
am
a459294e: am
c2003e1e: am
0855357c: Merge "User correct category for finding headless sync adapters" into mnc-dev
* commit '
a459294e88653dd5acdaee4a29c7bf6e66364f27':
User correct category for finding headless sync adapters
Billy Lau [Mon, 3 Aug 2015 20:00:55 +0000 (20:00 +0000)]
am
5680f9f6: Merge "Bug:
22879202 App compatibility with WRITE_SETTINGS failing" into mnc-dev
* commit '
5680f9f6d669e7d2f45db1027d53359b9ad327ff':
Bug:
22879202 App compatibility with WRITE_SETTINGS failing
Svetoslav Ganov [Mon, 3 Aug 2015 19:58:54 +0000 (19:58 +0000)]
am
688efe5d: am
87920455: Merge "Fix NPE in AppOpsService" into mnc-dev
* commit '
688efe5da94ec632af548c5f5bc4b46fad23165c':
Fix NPE in AppOpsService
Svetoslav Ganov [Mon, 3 Aug 2015 19:58:49 +0000 (19:58 +0000)]
am
c2003e1e: am
0855357c: Merge "User correct category for finding headless sync adapters" into mnc-dev
* commit '
c2003e1eba4a0bc98452a2b425e7d8dc99337e73':
User correct category for finding headless sync adapters
Billy Lau [Mon, 3 Aug 2015 19:53:28 +0000 (19:53 +0000)]
Merge "Bug:
22879202 App compatibility with WRITE_SETTINGS failing" into mnc-dev
Svetoslav Ganov [Mon, 3 Aug 2015 19:50:55 +0000 (19:50 +0000)]
am
87920455: Merge "Fix NPE in AppOpsService" into mnc-dev
* commit '
87920455ae63deb0b7d14df06edeb879e6494cc1':
Fix NPE in AppOpsService
Svetoslav Ganov [Mon, 3 Aug 2015 19:50:48 +0000 (19:50 +0000)]
am
0855357c: Merge "User correct category for finding headless sync adapters" into mnc-dev
* commit '
0855357c4fec1fddb4ebf20d9e7986090962f99d':
User correct category for finding headless sync adapters
Svetoslav Ganov [Mon, 3 Aug 2015 19:41:34 +0000 (19:41 +0000)]
Merge "Fix NPE in AppOpsService" into mnc-dev
Svetoslav Ganov [Mon, 3 Aug 2015 19:41:15 +0000 (19:41 +0000)]
Merge "User correct category for finding headless sync adapters" into mnc-dev
Jim Miller [Sat, 1 Aug 2015 01:42:53 +0000 (18:42 -0700)]
Don't wipe device because of short PIN, patterns or passwords
This fixes a bug where we were counting short PIN, patterns and
passwords as attempts. For devices with a device policy admin,
this would cause devices to get wiped after a short amount of
interaction with the UI.
Fixes bug
22844609
Change-Id: I7616b38d954f89d4a2cee23f9aec1b898041b1f2
Deepanshu Gupta [Mon, 3 Aug 2015 18:25:45 +0000 (11:25 -0700)]
Revert to using AppTheme for LayoutLib tests.
Use AppTheme for all tests other than testExpand. AppTheme contains an
attribute needed by testArrayCheck. Also, since the AppTheme extends
Theme.Material.Light.DarkActionBar, other tests should be unaffected.
Also, update the golden image for the testArrayCheck.
Change-Id: Ib5f53f3b029c5aceef2b622e5ac63952d6b1972a
Lajos Molnar [Mon, 3 Aug 2015 18:42:14 +0000 (18:42 +0000)]
am
02159cf3: am
2f501cc0: am
0ca1e98f: Merge "media: Clarify MediaCodec and CodecCapabilities documentation" into mnc-dev
* commit '
02159cf3c9464c8a24f526d254dbdfd46531b4f9':
media: Clarify MediaCodec and CodecCapabilities documentation
Lajos Molnar [Mon, 3 Aug 2015 18:33:57 +0000 (18:33 +0000)]
am
2f501cc0: am
0ca1e98f: Merge "media: Clarify MediaCodec and CodecCapabilities documentation" into mnc-dev
* commit '
2f501cc00a09d328e39e4c02aa72b894624acf54':
media: Clarify MediaCodec and CodecCapabilities documentation
Lajos Molnar [Mon, 3 Aug 2015 18:25:18 +0000 (18:25 +0000)]
am
0ca1e98f: Merge "media: Clarify MediaCodec and CodecCapabilities documentation" into mnc-dev
* commit '
0ca1e98fdf300ddbbccbfce26bba5947109597f1':
media: Clarify MediaCodec and CodecCapabilities documentation
Lajos Molnar [Mon, 3 Aug 2015 18:17:57 +0000 (18:17 +0000)]
Merge "media: Clarify MediaCodec and CodecCapabilities documentation" into mnc-dev
Deepanshu Gupta [Mon, 3 Aug 2015 17:23:56 +0000 (10:23 -0700)]
Fix Matrix_Delegate.native_getValues()
The bug manifested itself by not rendering the wifi icon in the status
bar.
Change-Id: I7debf3eef387965d774bf66e856812e67c8552a7
Geoff Mendal [Mon, 3 Aug 2015 16:43:20 +0000 (16:43 +0000)]
am
7e1c227e: (-s ours) am
91ddd4ad: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
7e1c227e26d76aefb98405defa11ff1e932cafca':
Import translations. DO NOT MERGE
Alan Viverette [Mon, 3 Aug 2015 16:42:14 +0000 (12:42 -0400)]
Update Material link text to be colorAccent
Bug:
22918108
Change-Id: I29b795b4c8d2a017dcaca1a9b65705eafaf2140c
Geoff Mendal [Mon, 3 Aug 2015 16:32:10 +0000 (16:32 +0000)]
am
91ddd4ad: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
91ddd4ad1368db5fb304f4640c7fb1e2678fbb6b':
Import translations. DO NOT MERGE
Ruben Brunk [Mon, 3 Aug 2015 16:29:46 +0000 (16:29 +0000)]
am
20733ba9: am
b1286a7a: am
7469060e: Merge "Make vendor keys visible in Camera2 java APIs." into mnc-dev
* commit '
20733ba93142f08e413a0ce19bbc7ccef8a1085f':
Make vendor keys visible in Camera2 java APIs.
Geoff Mendal [Mon, 3 Aug 2015 16:25:58 +0000 (16:25 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Ruben Brunk [Mon, 3 Aug 2015 16:22:53 +0000 (16:22 +0000)]
am
b1286a7a: am
7469060e: Merge "Make vendor keys visible in Camera2 java APIs." into mnc-dev
* commit '
b1286a7a7202388c307469344e0079c1651fd8d6':
Make vendor keys visible in Camera2 java APIs.
Ruben Brunk [Mon, 3 Aug 2015 16:16:12 +0000 (16:16 +0000)]
am
7469060e: Merge "Make vendor keys visible in Camera2 java APIs." into mnc-dev
* commit '
7469060e7855ca5b32f66fbad1a0a4f88737c754':
Make vendor keys visible in Camera2 java APIs.
Ruben Brunk [Mon, 3 Aug 2015 16:09:07 +0000 (16:09 +0000)]
Merge "Make vendor keys visible in Camera2 java APIs." into mnc-dev
Geoff Mendal [Mon, 3 Aug 2015 16:02:23 +0000 (11:02 -0500)]
Import translations. DO NOT MERGE
Change-Id: I1e66c1b10c0bd0e13369aeb3a24c219afc45d4e9
Auto-generated-cl: translation import
OSDN Git Service
