OSDN Git Service
Paul Soulos [Tue, 4 Aug 2015 20:13:41 +0000 (20:13 +0000)]
Merge "Fix doc typo for default wearable notification size." into cw-e-dev
John Reck [Tue, 4 Aug 2015 19:54:45 +0000 (19:54 +0000)]
am
a975a844: am
70e5db94: Merge "Fix crash in kModeProcessNoContext" into mnc-dev
* commit '
a975a84498014526d665f3bf7d0a5387f6e8a96b':
Fix crash in kModeProcessNoContext
John Reck [Tue, 4 Aug 2015 19:48:30 +0000 (19:48 +0000)]
am
70e5db94: Merge "Fix crash in kModeProcessNoContext" into mnc-dev
* commit '
70e5db9413f82bf1f000bd99b3d2dbecf6e4ab04':
Fix crash in kModeProcessNoContext
John Reck [Tue, 4 Aug 2015 19:38:15 +0000 (19:38 +0000)]
Merge "Fix crash in kModeProcessNoContext" into mnc-dev
Paul Soulos [Tue, 4 Aug 2015 18:59:45 +0000 (11:59 -0700)]
Fix doc typo for default wearable notification size.
Change-Id: Ic3428278eee0b541de3e1b355692401170d1ab3b
Julia Reynolds [Tue, 4 Aug 2015 18:41:20 +0000 (18:41 +0000)]
am
36fc79e2: am
35a1a209: Merge "Include dnd status in bugreports." into mnc-dev
* commit '
36fc79e2f8f4b4e186dd7de4c646639c434f3e8b':
Include dnd status in bugreports.
Julia Reynolds [Tue, 4 Aug 2015 18:33:15 +0000 (18:33 +0000)]
am
35a1a209: Merge "Include dnd status in bugreports." into mnc-dev
* commit '
35a1a2095cb6208a7614c35fe19fced6026d3db1':
Include dnd status in bugreports.
Julia Reynolds [Tue, 4 Aug 2015 18:27:13 +0000 (18:27 +0000)]
Merge "Include dnd status in bugreports." into mnc-dev
John Reck [Tue, 4 Aug 2015 18:17:39 +0000 (11:17 -0700)]
Fix crash in kModeProcessNoContext
Bug:
22931143
Change-Id: I9897a28b1edd006aee67ae2343874ad92bbd15a0
Matthew Williams [Tue, 4 Aug 2015 17:57:23 +0000 (17:57 +0000)]
am
d5fe5a8f: am
fad3c663: Merge "Remove spurious syncmanager wake-ups" into mnc-dev
* commit '
d5fe5a8fa1f770b929dbd786381a6ad45a754301':
Remove spurious syncmanager wake-ups
Matthew Williams [Tue, 4 Aug 2015 17:46:11 +0000 (17:46 +0000)]
am
fad3c663: Merge "Remove spurious syncmanager wake-ups" into mnc-dev
* commit '
fad3c6638168ad65b4f4677a777b8f2dc7e5c9c9':
Remove spurious syncmanager wake-ups
Matthew Williams [Tue, 4 Aug 2015 17:35:48 +0000 (17:35 +0000)]
Merge "Remove spurious syncmanager wake-ups" into mnc-dev
Ian Pedowitz [Tue, 4 Aug 2015 15:02:41 +0000 (15:02 +0000)]
am
682e0237: am
845d14db: Revert "Permissions: GET_ACCOUNTS permission cleanup"
* commit '
682e0237eccd58efac776fd282021ec16259b632':
Revert "Permissions: GET_ACCOUNTS permission cleanup"
Ian Pedowitz [Tue, 4 Aug 2015 14:55:54 +0000 (14:55 +0000)]
am
845d14db: Revert "Permissions: GET_ACCOUNTS permission cleanup"
* commit '
845d14db9066c3262f270237b52e315aa71508b2':
Revert "Permissions: GET_ACCOUNTS permission cleanup"
Wale Ogunwale [Tue, 4 Aug 2015 14:53:33 +0000 (14:53 +0000)]
am
ae351ec1: am
b2690f38: Merge "Fail silently if a process trys to launch an acitvity for background user" into mnc-dev
* commit '
ae351ec112dc5ad23585552af30a138aa29ed2f5':
Fail silently if a process trys to launch an acitvity for background user
Ian Pedowitz [Tue, 4 Aug 2015 14:47:37 +0000 (07:47 -0700)]
Revert "Permissions: GET_ACCOUNTS permission cleanup"
Temporarily revert ag/735253 until b/
22902898 can be resolved with a
proper DMAgent prebuilt drop.
This reverts commit
e7ed827a104ba005b93faa2edb3bc77f72b240ec.
Bug:
22902898
Wale Ogunwale [Tue, 4 Aug 2015 14:46:07 +0000 (14:46 +0000)]
am
b2690f38: Merge "Fail silently if a process trys to launch an acitvity for background user" into mnc-dev
* commit '
b2690f3857d207321c8e6dc85a3b529ac52404f2':
Fail silently if a process trys to launch an acitvity for background user
Wale Ogunwale [Tue, 4 Aug 2015 14:38:04 +0000 (14:38 +0000)]
Merge "Fail silently if a process trys to launch an acitvity for background user" into mnc-dev
Jason Monk [Tue, 4 Aug 2015 13:59:25 +0000 (13:59 +0000)]
am
bbb17765: am
55dbf2d7: Merge "QS: Allow Flashlight Tile to handle reset state" into mnc-dev
* commit '
bbb1776581330257f16e2bf0a85d9bafb73395d1':
QS: Allow Flashlight Tile to handle reset state
Jason Monk [Tue, 4 Aug 2015 13:52:34 +0000 (13:52 +0000)]
am
55dbf2d7: Merge "QS: Allow Flashlight Tile to handle reset state" into mnc-dev
* commit '
55dbf2d78e575b6c7b53e06aed17ff7406305a13':
QS: Allow Flashlight Tile to handle reset state
Jason Monk [Tue, 4 Aug 2015 13:43:21 +0000 (13:43 +0000)]
Merge "QS: Allow Flashlight Tile to handle reset state" into mnc-dev
Pavlin Radoslavov [Tue, 4 Aug 2015 04:50:20 +0000 (04:50 +0000)]
am
4e07468f: am
29b8c4ab: Reset the pointer to the Bluetooth GATT service
* commit '
4e07468fcec44f97dffde9533b1480674dc47d86':
Reset the pointer to the Bluetooth GATT service
Pavlin Radoslavov [Tue, 4 Aug 2015 04:41:42 +0000 (04:41 +0000)]
am
29b8c4ab: Reset the pointer to the Bluetooth GATT service
* commit '
29b8c4ab8ac4942e46a9ad4ced795bf06b9f8481':
Reset the pointer to the Bluetooth GATT service
Pavlin Radoslavov [Tue, 4 Aug 2015 00:44:47 +0000 (17:44 -0700)]
Reset the pointer to the Bluetooth GATT service
During error recovery, if the mBluetooth pointer is reset to null,
reset the mBluetoothGatt pointer as well.
Bug:
21756298
Change-Id: I26204ba47dd3c5465bb7de30cfa5dc0f07eee2fd
Adam Lesinski [Tue, 4 Aug 2015 01:43:42 +0000 (01:43 +0000)]
am
7608f541: am
59d72c86: Merge "BatteryStats: Add debug logging to find source of b/
22716723" into mnc-dev
* commit '
7608f5416dec7e7756b3c519b88ca348a3b196bc':
BatteryStats: Add debug logging to find source of b/
22716723
Adam Lesinski [Tue, 4 Aug 2015 01:35:06 +0000 (01:35 +0000)]
am
59d72c86: Merge "BatteryStats: Add debug logging to find source of b/
22716723" into mnc-dev
* commit '
59d72c86269f4d0c914c233d16a9bf00f0440df8':
BatteryStats: Add debug logging to find source of b/
22716723
Adam Lesinski [Tue, 4 Aug 2015 01:26:27 +0000 (01:26 +0000)]
Merge "BatteryStats: Add debug logging to find source of b/
22716723" into mnc-dev
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
Matthew Williams [Mon, 3 Aug 2015 22:56:36 +0000 (15:56 -0700)]
Remove spurious syncmanager wake-ups
BUG:
22287469
1) Fix SyncManager waking up every 2 hrs if there is nothing
to do.
2) Fix sync wake-up alarm not being properly updated if the new
alarm was in the future.
2a) Due to staus bar sync signal that were removed post-K
one of the wake-ups was for 30s in the future, removed this
@hide intent completely.
3) The SyncManager will still set a timeout alarm for 5mins after
the start of a sync. Leaving this in as to post to a handler is
less expensive but more complex, and the alarm update is
correctly working now.
Change-Id: If51c9dd68391ccaeb480a17eb5a1364c4afe4c2a
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
Wale Ogunwale [Mon, 3 Aug 2015 22:56:49 +0000 (15:56 -0700)]
Fail silently if a process trys to launch an acitvity for background user
Doing this so we don't break current apps. In the future we should
properly position the activity in the stack (i.e. behind all current
user activity/task) and not change the positioning of stacks.
Bug:
21801163
Bug:
13507605
Bug:
22929608
Change-Id: I979b6288e66f5b2ec2a6f22cb8d416e5c68109bd
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
Adam Lesinski [Mon, 3 Aug 2015 21:37:38 +0000 (14:37 -0700)]
BatteryStats: Add debug logging to find source of b/
22716723
Bug:
22716723
Change-Id: I97b940b702666b393555622d034e1c694b1e346a
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: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: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
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
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: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
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
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: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