204297 Commits

Author SHA1 Message Date
John Reck
5d0c84bd7f am c03ab87a: Merge "Disable skipping frames on empty damage" into mnc-dev
* commit 'c03ab87ac9f721ff22bfe5e9c0cd0e5be64f261e':
  Disable skipping frames on empty damage
2015-08-04 03:10:02 +00:00
Svetoslav Ganov
b2972dbd75 am ac8c9861: Merge "Notify settings URI change without a lock held" into mnc-dev
* commit 'ac8c98614cb8260615795b2042699d93b21a1097':
  Notify settings URI change without a lock held
2015-08-04 03:09:50 +00:00
Dianne Hackborn
a7b8074191 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 03:09:43 +00:00
John Reck
10fdfb1815 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
2015-08-04 03:09:33 +00:00
Jeff Sharkey
275d41d0a1 am 0faca96f: Merge "Avoid deadlock by broadcasting outside lock." into mnc-dev
* commit '0faca96f939b8530e5387a30e317d852f39f689f':
  Avoid deadlock by broadcasting outside lock.
2015-08-04 03:09:25 +00:00
Jeff Sharkey
94dacb1218 Fix moving of apps into legacy ASEC.
Derive the correct current volume UUID for comparison, and only
check for cluster style installs when moving from internal storage.

Bug: 22616484
Change-Id: Idb6be2aa4aaa9b9f47ebbeeebd65c15a60d5d164
2015-08-03 18:28:06 -07: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
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
d9b0f8435b Merge "Fix issue #22860466: viapi security bug - rubber stamping in nested VIs" into mnc-dev 2015-08-04 01:07:36 +00:00
Prem Kumar
04e2cf6bc5 Merge "Make default selection for contact sharing to "Checked"." into mnc-dev 2015-08-04 00:41:46 +00:00
Wale Ogunwale
911bd0d3a5 Merge "Set broadcast nextReceiver correctly when package is disabled" into mnc-dev 2015-08-04 00:33:48 +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
Wale Ogunwale
9a6e13c347 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
2015-08-04 00:29:45 +00:00
Matthew Williams
d13667e31d am b3448bf1: am 608ad140: Merge "Idle Job Start During SCREEN_ON or DREAMING_STOPPED"
* commit 'b3448bf1379b7c13125973cdcc33173741baeaae':
  Idle Job Start During SCREEN_ON or DREAMING_STOPPED
2015-08-04 00:28:53 +00:00
Jean-Michel Trivi
6d00e41145 AudioService: check for audio device connection success
When connecting/disconnecting and audio device, AudioService
  was assuming that the call was always successful through
  AudioSystem.setDeviceConnectionState(). In the case of the
  connection of a wired headset (mic + headphones), this also
  causes A2DP to not be used for media playback.
The connection can fail if the audio device being connected
  is not supported by the platform. But if this failure is
  not taken into account for DEVICE_OUT_WIRED_HEADSET or
  HEADPHONES, A2DP would still be avoided even when an A2DP
  device reconnects at boot.
The fix consists in executing the connection logic only when
  the connection was deemed successful. Nothing is altered
  on the disconnection code path, or the direct connection
  of A2DP.
The javadoc is updated in AudioSystem to indicate the return
  codes to take into account in setDeviceConnectionState().

Bug 22511833

Change-Id: I22f0d2c7d4ab4fb9ee1be2f248907f721596a16f
2015-08-03 17:26:01 -07:00
Yusuke Sato
05f648e1d3 Clean up AssetManager::scanAndMergeZipLocked
Now that ZipFileRO::startIteration supports prefix/suffix matching,
we can pass dirName to the function for simpler code and slightly
better performance.

(cherry-pick of c796ad0a8be6df4a3b354690dfe5ce1df8136c09)

Change-Id: I0e2ac58de28020c2af8d8e569a97592b09596185
2015-08-03 17:24:42 -07:00
Yusuke Sato
957c23775f Let findSupportedAbi and hasRenderscriptBitcode scan only relevant files
for better performance. Without the optimization, these two functions
may check more than 100k file names in the pre-installed APK files,
which can take a few seconds to finish even on a recent device.

(cherry-pick of 34fe3df8519523dbb4bc27010fa57f259d5e868d)

Bug: 21957428
Change-Id: I5ebe0438019958d883a7fda6bd92ea4484211d23
2015-08-03 17:24:32 -07:00
Matthew Williams
b3448bf137 am 608ad140: Merge "Idle Job Start During SCREEN_ON or DREAMING_STOPPED"
* commit '608ad1409dc3cd86a66208ddaa31e3a4c54adfac':
  Idle Job Start During SCREEN_ON or DREAMING_STOPPED
2015-08-04 00:08:42 +00:00
Matthew Williams
608ad1409d Merge "Idle Job Start During SCREEN_ON or DREAMING_STOPPED" 2015-08-03 23:58:48 +00:00
John Reck
c03ab87ac9 Merge "Disable skipping frames on empty damage" into mnc-dev 2015-08-03 23:33:13 +00:00
Svetoslav Ganov
ac8c98614c Merge "Notify settings URI change without a lock held" into mnc-dev 2015-08-03 23:15:16 +00: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
Svetoslav
7e0683b3bd Notify settings URI change without a lock held
bug:22469552

Change-Id: Ie4a42ceef07e3a8e593fe2b1374420239242ce7b
2015-08-03 16:06:49 -07: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
John Reck
7290d93df9 Merge "Yell loudly about undefined behind in Bitmap, but work anyway" into mnc-dev 2015-08-03 22:50:25 +00:00
John Reck
6d4d0db312 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
2015-08-03 22:47:49 +00: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
Jeff Sharkey
0faca96f93 Merge "Avoid deadlock by broadcasting outside lock." into mnc-dev 2015-08-03 22:32:36 +00: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
Makoto Onuki
ad4c63b53d READ_SMS allows getLine1Number() [1/3]
Bug 22862050

Change-Id: I45dba41423dd3313984c93a6e674f37410fb3050
2015-08-03 15:10:57 -07:00
Jeff Sharkey
abc3e85b3c 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
2015-08-03 14:41:13 -07:00
Diego Perez
16a1c9e19b am 405eceb2: Merge "Restore session params "no decoration" flag" into mnc-dev
* commit '405eceb20a3f3e7a22d922fc2d0fb8283be337fa':
  Restore session params "no decoration" flag
2015-08-03 21:40:47 +00:00
Deepanshu Gupta
fecb60f1a7 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.
2015-08-03 21:34:35 +00:00
Diego Perez
405eceb20a Merge "Restore session params "no decoration" flag" into mnc-dev 2015-08-03 21:33:24 +00:00
Deepanshu Gupta
d985e3b619 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.
2015-08-03 21:27:50 +00:00
Jeff Sharkey
e2faac0a13 am 3ba2bfa7: Merge "Expand ringtone titles to support OGG and FLAC." into mnc-dev
* commit '3ba2bfa7b280bac76d4d60a7f548c5e06aaca569':
  Expand ringtone titles to support OGG and FLAC.
2015-08-03 21:03:39 +00:00
John Reck
01a0af31d7 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
2015-08-03 20:57:22 +00:00
Jeff Sharkey
3ba2bfa7b2 Merge "Expand ringtone titles to support OGG and FLAC." into mnc-dev 2015-08-03 20:54:32 +00:00
Jeff Sharkey
449e5fd5f8 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
2015-08-03 13:51:13 -07:00
Wale Ogunwale
2031adffb8 am f8576979: Merge "Also consider task intent when trimming recent tasks" into mnc-dev
* commit 'f85769797e14f0d10dcc99d695c6dee1eb56bd9c':
  Also consider task intent when trimming recent tasks
2015-08-03 20:40:37 +00:00
Alan Viverette
183aa948be am 7b4170fa: Merge "Update Material link text to be colorAccent" into mnc-dev
* commit '7b4170fa7f944e4cd73f1e82b56b4467de60d96c':
  Update Material link text to be colorAccent
2015-08-03 20:35:20 +00:00
Jim Miller
cd1e7f7b94 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
2015-08-03 20:35:13 +00:00
Wale Ogunwale
f85769797e Merge "Also consider task intent when trimming recent tasks" into mnc-dev 2015-08-03 20:31:31 +00:00
Alan Viverette
5be6cc6db9 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:28:59 +00:00
Alan Viverette
7b77b284de 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:28:51 +00:00
Alan Viverette
7b4170fa7f Merge "Update Material link text to be colorAccent" into mnc-dev 2015-08-03 20:27:17 +00:00
Jim Miller
45fcaa547d Merge "Don't wipe device because of short PIN, patterns or passwords" into mnc-dev 2015-08-03 20:25:00 +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
8233079094 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:01:10 +00:00