Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
199,432 Commits 3 Branches 0 Tags
0ca9e2dffb60781b4bdfa2a4a012f7ee2afa02b8
Commit Graph

54102 Commits

Author SHA1 Message Date
Yohei Yukawa
9aebdb4c39 am d7d14033: am 2d34a8b7: Merge "Revert "Do not forceLayout when window is resized"" into mnc-dev 
* commit 'd7d14033af438b88053454e7d73c1689eaa77c35':
  Revert "Do not forceLayout when window is resized"
 2015-08-04 20:54:48 +00:00
Nick Kralevich
2eafb06f5d am b2c71814: am 97b68bbe: Merge "UsbDeviceManager: fix b/21429947 regression (try #2)" into mnc-dev 
* commit 'b2c718146b1be18942bc5d76be68e0d437cbbe8b':
  UsbDeviceManager: fix b/21429947 regression (try #2)
 2015-08-04 20:54:44 +00:00
Yohei Yukawa
d7d14033af am 2d34a8b7: Merge "Revert "Do not forceLayout when window is resized"" into mnc-dev 
* commit '2d34a8b7181635c0ff0b1f2390d70e3ac6960f00':
  Revert "Do not forceLayout when window is resized"
 2015-08-04 20:40:41 +00:00
Nick Kralevich
b2c718146b am 97b68bbe: Merge "UsbDeviceManager: fix b/21429947 regression (try #2)" into mnc-dev 
* commit '97b68bbe7180ca15ab10d6f65bbdac6c7e64885b':
  UsbDeviceManager: fix b/21429947 regression (try #2)
 2015-08-04 20:40:35 +00:00
Paul Soulos
3adc6671e9 Merge "Fix doc typo for default wearable notification size." into cw-e-dev 2015-08-04 20:13:41 +00:00
Yohei Yukawa
2d34a8b718 Merge "Revert "Do not forceLayout when window is resized"" into mnc-dev 2015-08-04 19:51:20 +00:00
Nick Kralevich
97b68bbe71 Merge "UsbDeviceManager: fix b/21429947 regression (try #2)" into mnc-dev 2015-08-04 19:46:06 +00:00
Paul Soulos
aa4f4bf6ce Fix doc typo for default wearable notification size. 
Change-Id: Ic3428278eee0b541de3e1b355692401170d1ab3b
 2015-08-04 11:59:45 -07:00
Matthew Williams
c62598bc58 am d5fe5a8f: am fad3c663: Merge "Remove spurious syncmanager wake-ups" into mnc-dev 
* commit 'd5fe5a8fa1f770b929dbd786381a6ad45a754301':
  Remove spurious syncmanager wake-ups
 2015-08-04 17:57:23 +00:00
Matthew Williams
d5fe5a8fa1 am fad3c663: Merge "Remove spurious syncmanager wake-ups" into mnc-dev 
* commit 'fad3c6638168ad65b4f4677a777b8f2dc7e5c9c9':
  Remove spurious syncmanager wake-ups
 2015-08-04 17:46:11 +00:00
Nick Kralevich
1a008c1ca0 UsbDeviceManager: fix b/21429947 regression (try #2) 
As discussed in b/21429947 (commit
674019065b), MTP must always be
enabled, even if access to the underlying MTP data is disabled.
Otherwise, Android will not enumerate on the USB bus, and won't
receive notifications from the kernel about USB state changes. This
effectively prevents using MTP functionality on user builds, or
on userdebug/eng builds with adb turned off.

Always ensure that MTP is the default driver mode.

Move the DISALLOW_USB_FILE_TRANSFER filtering of mUsbDataUnlocked from
setting time to the time we post the sticky broadcast.

Remove isUsbDataUnlocked(). It essentially duplicates data in the sticky
broadcast.

Bug: 22447614
Bug: 21429947
Change-Id: I9d0d94cadbf6db6281ebd77bfb7162f9d06520c2
 2015-08-04 10:36:37 -07:00
Matthew Williams
fad3c66381 Merge "Remove spurious syncmanager wake-ups" into mnc-dev 2015-08-04 17:35:48 +00:00
Ian Pedowitz
8a4465e8ec am 682e0237: am 845d14db: Revert "Permissions: GET_ACCOUNTS permission cleanup" 
* commit '682e0237eccd58efac776fd282021ec16259b632':
  Revert "Permissions: GET_ACCOUNTS permission cleanup"
 2015-08-04 15:02:41 +00:00
Ian Pedowitz
682e0237ec am 845d14db: Revert "Permissions: GET_ACCOUNTS permission cleanup" 
* commit '845d14db9066c3262f270237b52e315aa71508b2':
  Revert "Permissions: GET_ACCOUNTS permission cleanup"
 2015-08-04 14:55:54 +00:00
Wale Ogunwale
c170d7ded3 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
 2015-08-04 14:53:33 +00:00
Ian Pedowitz
845d14db90 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 e7ed827a10.

Bug: 22902898
 2015-08-04 07:47:37 -07:00
Wale Ogunwale
ae351ec112 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
 2015-08-04 14:46:07 +00:00
Wale Ogunwale
b2690f3857 Merge "Fail silently if a process trys to launch an acitvity for background user" into mnc-dev 2015-08-04 14:38:04 +00:00
Adam Lesinski
4eb6c10d2d 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
 2015-08-04 01:43:42 +00:00
Adam Lesinski
7608f5416d 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
 2015-08-04 01:35:06 +00:00
Adam Lesinski
59d72c8626 Merge "BatteryStats: Add debug logging to find source of b/22716723" into mnc-dev 2015-08-04 01:26:27 +00:00
Dianne Hackborn
2492279816 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
 2015-08-04 01:19:55 +00:00
Matthew Williams
665d0140ef 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
 2015-08-03 18:15:12 -07:00
Dianne Hackborn
b20a8ed952 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
 2015-08-04 01:12:33 +00:00
Dianne Hackborn
5dd9ef044c 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
 2015-08-04 01:09:02 +00:00
Dianne Hackborn
d9b0f8435b Merge "Fix issue #22860466: viapi security bug - rubber stamping in nested VIs" into mnc-dev 2015-08-04 01:07:36 +00:00
Dianne Hackborn
b0bc8368f5 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
 2015-08-04 01:00:12 +00:00
Dianne Hackborn
fb81d09d35 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
 2015-08-03 17:33:38 -07:00
Dianne Hackborn
3011f645ab Merge "Fix issue #22912704: "android.process.acore has stopped" dialog keeps popping up" into mnc-dev 2015-08-03 23:10:07 +00:00
Wale Ogunwale
f5ea12c2aa 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
 2015-08-03 15:56:49 -07:00
Adam Lesinski
fbabe7dd6a BatteryStats: Add debug logging to find source of b/22716723 
Bug:22716723
Change-Id: I97b940b702666b393555622d034e1c694b1e346a
 2015-08-03 15:45:13 -07:00
Dianne Hackborn
28ec27cbfa Fix issue #22912704: "android.process.acore has stopped" dialog keeps popping up 
Slice 'em up!

Change-Id: Ibba3af7ec5b7f92e6d5e55a57aa838a7f7f936e1
 2015-08-03 15:28:28 -07:00
Alan Viverette
5c8a5d0ff4 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
 2015-08-03 20:36:38 +00:00
Alan Viverette
a2db7e68c9 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
 2015-08-03 20:36:33 +00:00
Alan Viverette
ce337493fd am ef3f58e5: Merge "Make ResolverDrawerLayout look like a ScrollView to accessibility" into mnc-dev 
* commit 'ef3f58e59ba44b2679e98ccb46d588eba2c99cac':
  Make ResolverDrawerLayout look like a ScrollView to accessibility
 2015-08-03 20:26:58 +00:00
Alan Viverette
42c9b35fa2 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
 2015-08-03 20:26:51 +00:00
Alan Viverette
ef3f58e59b Merge "Make ResolverDrawerLayout look like a ScrollView to accessibility" into mnc-dev 2015-08-03 20:17:57 +00:00
Alan Viverette
e76bf46ab9 Merge "Add badge content description to TargetInfo, use in ResolverActivity" into mnc-dev 2015-08-03 20:17:31 +00:00
Billy Lau
8b095b1c19 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
 2015-08-03 20:09:09 +00:00
Billy Lau
f83e852661 am 5680f9f6: Merge "Bug: 22879202 App compatibility with WRITE_SETTINGS failing" into mnc-dev 
* commit '5680f9f6d669e7d2f45db1027d53359b9ad327ff':
  Bug: 22879202 App compatibility with WRITE_SETTINGS failing
 2015-08-03 20:00:55 +00:00
Billy Lau
5680f9f6d6 Merge "Bug: 22879202 App compatibility with WRITE_SETTINGS failing" into mnc-dev 2015-08-03 19:53:28 +00:00
Ruben Brunk
20733ba931 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.
 2015-08-03 16:22:53 +00:00
Ruben Brunk
b1286a7a72 am 7469060e: Merge "Make vendor keys visible in Camera2 java APIs." into mnc-dev 
* commit '7469060e7855ca5b32f66fbad1a0a4f88737c754':
  Make vendor keys visible in Camera2 java APIs.
 2015-08-03 16:16:12 +00:00
Ruben Brunk
7469060e78 Merge "Make vendor keys visible in Camera2 java APIs." into mnc-dev 2015-08-03 16:09:07 +00:00
Alan Viverette
1ff29f2d56 Make ResolverDrawerLayout look like a ScrollView to accessibility 
Disable accessibility focus on the layout itself and expose the class
name as ScrollView so that we can get auto-scroll working until we have
first-class support for specifying automatic scrolling behavior.

Bug: 22667764
Change-Id: I9b97e40f16038046898e5b56b935a61db9073ac6
 2015-08-03 10:01:23 -04:00
Svetoslav Ganov
4f3d5c75e0 am 1eb06eaa: am 8dbd4848: Merge "Add per UID control to app ops." into mnc-dev 
* commit '1eb06eaaef5b56cd71a7cc7e9f5cd5d2b199f420':
  Add per UID control to app ops.
 2015-08-01 16:38:35 +00:00
Dianne Hackborn
cba2c59612 am 6aa0843e: am fb68b0ad: Merge "Fix issue #21895842: Add is_assist_blocked to assist.ViewNode.NodeProperties" into mnc-dev 
* commit '6aa0843ed95d3af828c8dc415053b91f3db25fac':
  Fix issue #21895842: Add is_assist_blocked to assist.ViewNode.NodeProperties
 2015-08-01 16:37:17 +00:00
Alan Viverette
4cf97c915a am 7bfe7b5b: am 5cca30a4: Merge "Revert two changes to LinearLayout measurement" into mnc-dev 
* commit '7bfe7b5b541e3b4585c3ef7eb6d4fb3bd9218df0':
  Revert two changes to LinearLayout measurement
 2015-08-01 16:36:57 +00:00
Alan Viverette
6550e461e5 am 0568a230: am 9d8a230f: Revert "View measurement optimization" 
* commit '0568a230b34f879215e65fbaa79dfa377085bb41':
  Revert "View measurement optimization"
 2015-08-01 16:36:52 +00:00
Deepanshu Gupta
92a59d8ea8 am 92385030: am e836a229: Fix build. 
* commit '923850304a00d337e8bd76000c8ff480df25e7e2':
  Fix build.
 2015-08-01 16:35:31 +00:00