8322 Commits

Author SHA1 Message Date
Amit Mahajan
1466a9c16c Revert "Adding logging to debug SignalStrength callback missing issue."
This reverts commit 6ba726f825162481644df89cf0754f4e20f2793e.

Bug: 20444738
Change-Id: Idf118b259cfd3854feac851b9532d4fff1d74985
2015-04-28 17:51:14 +00:00
Julia Reynolds
6ab47fc111 Merge "Allow device initializers to set a preferred setup activity." into mnc-dev 2015-04-27 17:29:23 +00:00
Julia Reynolds
13c58bacc8 Allow device initializers to set a preferred setup activity.
This activity will launch by default on device reboot or user switch
during user initialization, even if there are higher priority 'home'
activities.

Bug: 20223050
Change-Id: I335aeb010a1ae5db07a4343d26e160c74bd299e1
2015-04-27 12:57:15 -04:00
Benjamin Franz
cde0a2a9ea Introduce disable2 into StatusBarManager
We ran out of space for new disable flags, so need to introduce a
disable2 API into StatusBarManager and update all the underlying code
to support the second set of flags.

Bug: 20331928
Change-Id: I5009b393133c576b37d7e2bae0df97cb8c41a065
2015-04-27 16:46:12 +00:00
Jeff Sharkey
49314cea50 Merge "Migrate primary external storage." 2015-04-25 01:03:08 +00:00
Jeff Sharkey
275e3e43f2 Migrate primary external storage.
Wire up through MountService to call down into vold.  Watch for
unsolicited events that report progress, including special value "82"
that signals that copy has finished.  We use this value to persist
the volumeUuid in case of unexpected reboot, since it indicates the
new volume is ready.

Wire progress updates through existing callback pipeline.

Update the volume mounting code to match against the persisted UUID
when selecting the primary external storage.

Bug: 19993667
Change-Id: Id46957610fb43517bbfbc368f29b7d430664590d
2015-04-24 18:01:45 -07:00
Etan Cohen
cd895cdf4d Merge changes from topic 'mwd-merge-042415'
* changes:
  Rename removeVideoCallListener to unregisterCallback
  Bluetooth document fix: remove reference from open API to hidden entities
  Fix build due to merge of 7595842 and renaming due to 8eb87f0
  Merge commit '052a0da' into merge2
  Merge commit 'db1dbb8' into merge2
  Merge commit '7e5e791' into merge2
  Merge commit '170102d' into merge2
  Merge commit '4cb5d80' into merge2
  Merge commit '83cda00' into merge2
  Merge commit 'c91bc62' into merge2
  Merge commit 'cffc360' into merge2
  Merge commit '7f61051' into merge2
  Merge commit '167c3a7' into merge2
  Merge commit '4467b98' into merge2
  Merge commit '25a217c' into merge2
  Merge commit '04b18ec' into merge2
  Merge commit '7595842' into merge2
  Merge commit '2bbd2b6' into merge2
  Merge commit '4890351' into merge2
  Merge commit 'cd405fe' into merge2
  Merge commit '6ddbb5e' into merge2
  Merge commit 'de93575' into merge2
  Merge commit '9561e74' into merge2
2015-04-25 00:51:47 +00:00
Jim Miller
b423e300f7 Merge "Don't use a WeakReference for fingerprint notification object." 2015-04-25 00:25:54 +00:00
Adrian Roos
965bbb8f2e Merge "Smooth transitions between SHOW_WHEN_LOCKED activities" 2015-04-25 00:18:23 +00:00
Adrian Roos
602c68e4ff Smooth transitions between SHOW_WHEN_LOCKED activities
Bug: 12536117
Change-Id: Ia5f96e49587661440ae31fba17c42b2e3a9557fb
2015-04-24 17:12:08 -07:00
Jim Miller
b21e1b2eaa Don't use a WeakReference for fingerprint notification object.
This was causing a problem where a GC in the system process
would inadvertently remove the callback.

Potential fix for bug 20491119

Change-Id: I9d7d0bb8e29fcd6c52cb3be645bbb9c8e5413d48
2015-04-24 17:01:43 -07:00
Amith Yamasani
bf02d48f4a Merge "More usage tracking" 2015-04-24 23:39:37 +00:00
Amith Yamasani
f47e51ec60 More usage tracking
Notification listeners can now report that a notification
has been seen by the user and that package is then marked
as active.

Bug: 20066058
Change-Id: I336040a52c44c21fd0d78b02ec9a19d448c64b40
2015-04-24 16:12:01 -07:00
Rubin Xu
f8d26e24af Merge "Add missing permission check in MountService" 2015-04-24 21:14:41 +00:00
Etan Cohen
a179962b61 Merge commit '25a217c' into merge2
Change-Id: I116a9dbf19e95651a7c50393e4dcd7fb59ca3f3f
2015-04-24 13:58:45 -07:00
Simranjit Singh Kohli
82d01782b3 [Fix confirmCredntials flow]
This CL contains 2 fixes:

1. On a successfult confirm credential, lastAuthenticatedTime was
   not getting updated. This gets fixed.

2. Historically, confirmCredential used to work for accounts NOT on
   the device. Setting lastAuthenticated time only for existing
   accounts and preventing crash if account is not on the device.

Bug: 20141809
Change-Id: I301d49cbc4a594af6110366ef6f55350f74d250d
2015-04-24 13:56:48 -07:00
Etan Cohen
5c0d6f61ab Merge commit '6ddbb5e' into merge2 2015-04-24 13:44:05 -07:00
Olawale Ogunwale
a298a96af7 am 3846d3a4: am 6d856bfb: am cf7d2d95: Merge "[ActivityManager] Avoid orphan ContentProviderRecord."
* commit '3846d3a4c5d79a9d7e86e43c64a5c21a29036de0':
  [ActivityManager] Avoid orphan ContentProviderRecord.
2015-04-24 18:35:29 +00:00
Olawale Ogunwale
6d856bfba5 am cf7d2d95: Merge "[ActivityManager] Avoid orphan ContentProviderRecord."
* commit 'cf7d2d95adb358a628c2622b43a999d3ab784406':
  [ActivityManager] Avoid orphan ContentProviderRecord.
2015-04-24 18:11:29 +00:00
dcashman
8a33121ad9 Remove line wrapping for publickey encoding.
This adds unnecessary whitespace in packages.xml and is contrary to the approach
taken by certs.  Remove it.

Change-Id: I217bb94af97c3b38dab1fd806ffe7b7600fa6fdd
2015-04-24 10:52:56 -07:00
Olawale Ogunwale
cf7d2d95ad Merge "[ActivityManager] Avoid orphan ContentProviderRecord." 2015-04-24 17:43:01 +00:00
Wale Ogunwale
a6ab5c4efb Cleaned-up unused session argument.
Change-Id: Iff9d0df5f1643c581767a41a1ba4b1d43e5b45d8
2015-04-24 09:00:41 -07:00
John Spurlock
f74a212ffb Merge "AudioService: Fix mConnectedDevices iteration issues." 2015-04-24 14:50:09 +00:00
Rubin Xu
cd7a014981 Add missing permission check in MountService
Protect MountService.getPassword() with ACCESS_KEYGUARD_SECURE_STORAGE
permission. Protect finishMediaUpdate() which is only called by
PackageManagerService. Also fix a lock issue in MountService.

Bug: 19961359
Change-Id: I50ec806fb37724ef239ef83f4e33265133b51d0b
2015-04-24 12:03:47 +01:00
Jeff Sharkey
620b32b316 Package and storage movement callbacks.
Since package and primary storage movement can take quite awhile,
we want to have SystemUI surface progress and allow the Settings
app to be torn down while the movement proceeds in the background.

Movement requests now return a unique ID that identifies an ongoing
operation, and interested parties can observe ongoing progress and
final status.  Internally, progress and status are overloaded so
the values 0-100 are progress, and any values outside that range
are terminal status.

Add explicit constants for special-cased volume UUIDs, and change
the APIs to accept VolumeInfo to reduce confusion.  Internally the
UUID value "null" means internal storage, and "primary_physical"
means the current primary physical volume.  These values are used
for both package and primary storage movement destinations.

Persist the current primary storage location in MountService
metadata, since it can be moved over time.

Surface disk scanned events with separate volume count so we can
determine when it's partitioned successfully.  Also send broadcast
to support TvSettings launching into adoption flow.

Bug: 19993667
Change-Id: Ic8a4034033c3cb3262023dba4a642efc6795af10
2015-04-23 20:32:17 -07:00
Jinsuk Kim
b349213891 Merge "CEC: Check port id for ARC status update on hotplug" 2015-04-24 01:45:29 +00:00
John Spurlock
8c3dc85de5 AudioService: Fix mConnectedDevices iteration issues.
- Don't remove from the map while iterating.
 - Use ArrayMap and tighten up all iterations to avoid unnecessary
   allocations.

Bug: 20523001
Change-Id: I2587d0f9778b38d96afdfd0e61b00b06911837ae
2015-04-23 21:32:37 -04:00
Jinsuk Kim
a6d5dad9bf CEC: Check port id for ARC status update on hotplug
Fixes a bug that was updating ARC status on hotplug event
regardless of the port for which the event occurred.

Bug: 20520664
Change-Id: I17c4f391af4dd221215412ed9e3ff3d730bbf152
2015-04-24 08:02:57 +09:00
Adrian Roos
3acf4f5c91 Merge "Migrate lockscreen.disabled on upgrade" 2015-04-23 22:15:40 +00:00
Adrian Roos
4383058bf4 Migrate lockscreen.disabled on upgrade
Bug: 19962043
Change-Id: Iecec4ea869aeb9d814f7447b4805caa571f3fd01
2015-04-23 22:14:12 +00:00
Svet Ganov
9bafd3b5e0 Merge "Revert some unnecessary changes in handling XML read" 2015-04-23 19:00:35 +00:00
Svet Ganov
e723e54650 Revert some unnecessary changes in handling XML read
Change-Id: I3bbbc3159930d80e2e1f28fa9c0035ae5029d4b8
2015-04-23 11:58:26 -07:00
Craig Mautner
015c5e57b5 Disallow data clearing of DeviceOwner.
There are OEM provided apps that are able to clear the data of the
device owner. That creates a security hole that this fixes.

Fixes bug 20107015.

Change-Id: I4ef313b394bd8059d19d20aa6533396305d1357d
2015-04-23 11:05:02 -07:00
Dianne Hackborn
be3d85fb96 Merge "Hopefully fix issue #20297662: Statusbar clock not updating" 2015-04-23 17:37:29 +00:00
Dianne Hackborn
35d5403775 Hopefully fix issue #20297662: Statusbar clock not updating
Make sure that whenever we no longer have a pending-idle-until
alarm, we get all of the pending alarms re-added.

Change-Id: I7e80bc02afff22827d876ef5d4a381ebb62ec8e3
2015-04-23 10:30:43 -07:00
Fyodor Kupolov
7fadb2f542 Merge "Do not create oat directory for an app in ASEC container" 2015-04-23 16:55:32 +00:00
Fyodor Kupolov
94056d1cb8 Do not create oat directory for an app in ASEC container
Currently installation fails, if an app is located on SD card (inside ASEC).
If an app is located inside ASEC, dexopt output should go to
/data/dalvik-cache. dexopt also needs to be performed at a later stage,
because the name of the oat file contains the absolute path to the dex file.

Bug: 20452651
Change-Id: I4432ca7a0b0e88b705705acf42e5cae78cadf729
2015-04-23 09:52:55 -07:00
Dianne Hackborn
4d7c8e04a2 Merge "Maybe fix needing wifi permission to dump battery stats." 2015-04-23 16:26:41 +00:00
Wale Ogunwale
2ff8ca659e Merge "Fixed bug with black background when exiting a wallpaper window." 2015-04-23 16:22:03 +00:00
Craig Mautner
de8b3fa6cb Merge "Fix bad crop on clip reveal animation" 2015-04-23 15:40:12 +00:00
Craig Mautner
80b1f64280 Fix bad crop on clip reveal animation
For non-fullscreen apps the dimensions of the app window must be used
to set up the animation.

Fixes bug 18392184.

Change-Id: Ia1681e4a2cb74be2f820cb76ddc7c651a5e4aab6
2015-04-23 15:37:48 +00:00
Dianne Hackborn
13a6a9b39e Maybe fix needing wifi permission to dump battery stats.
Change-Id: I39f265bbdf1855e6e31d1b43e0e919199708aebd
2015-04-22 18:03:59 -07:00
Christopher Tate
64da495dc7 Merge "Retain milestone timestamps of historical broadcast activity" 2015-04-23 00:28:33 +00:00
Christopher Tate
f278f12fae Retain milestone timestamps of historical broadcast activity
Also use a ring buffer now instead of using arraycopy() every time
we send a broadcast.

Bug 20297662
Bug 20426398

Change-Id: I682461f358e5bc6ebc63bbeb87d0ad07d85fe4b6
2015-04-22 17:27:15 -07:00
Wale Ogunwale
7e0fea3557 Merge "Don't limit fullscreen stack window size to parent window size" 2015-04-22 21:41:44 +00:00
Svet Ganov
db30ac84b6 Merge "Make read/write from/to XML persistent state more robust." 2015-04-22 20:44:20 +00:00
Svet Ganov
ba0821ed3b Make read/write from/to XML persistent state more robust.
When writing critical state to XML an excpetion can lead to creating
a malformed XML that is later parsed and may put the device in a bad
state. Hence, on any error while writing we should bail out and drop
the partially write state on the floor.

Corollary, any error on parsing can lead to having a partially read
state that is not consistent which may lead to writing this bad state
back to disk. Hence, on any error while parsing we should bail as
our current state may be unrecoverable.

Change-Id: Ia050c16198cb583f8a51263ad2035dbb948052b8
2015-04-22 13:42:54 -07:00
John Reck
f7de58130a Merge "GraphicsJNI Canvas cleanup" 2015-04-22 20:00:46 +00:00
Wale Ogunwale
b171abbca8 Don't limit fullscreen stack window size to parent window size
A previous change limited the size of a window to the parent window
size at max. so that child windows don't extend outside their parent
stack when resized in a multi-window environment. This broke the
wallpaper positioning functionality since the wallpaper is no longer
bigger than it's containing stack so it can't be scrolled. Now, we
only limit the window size to the parent window size if the window
stack is not fullscreen.

Bug: 19434096
Bug: 19225079
Change-Id: I1a8788727e6c4a91da45d8a87850093ef5a24edf
2015-04-22 12:47:17 -07:00
destradaa
4fbc845b68 Merge "Avoid performing work in the platform when GPS HAL does not support a feature. b/19271554" 2015-04-22 19:17:08 +00:00