26494 Commits

Author SHA1 Message Date
Fyodor Kupolov
a91a6f68f4 Merge "Hold wakelock while dexopting" into mnc-dev 2015-05-16 00:26:09 +00:00
Jeff Sharkey
2177ed407b Merge changes from topic 'bench' into mnc-dev
* changes:
  Command to change force adoptable state.
  Initial pass at storage benchmarks.
2015-05-15 21:55:57 +00:00
Adam Lesinski
038959e851 Merge "Remove UID from kernel cpu accounting when uninstalled" into mnc-dev 2015-05-15 21:25:00 +00:00
Adam Lesinski
b99e6d69c3 Merge "Parse uid_cputime proc file" into mnc-dev 2015-05-15 21:23:09 +00:00
Jeff Sharkey
4c099d0c49 Command to change force adoptable state.
Since user builds can't setprop, add an explicit "sm" verb to change
the force adoptable state.

Bug: 21191915
Change-Id: I719d9b18c1a98c97442a5ddb1cc5512e8e4d3d3f
2015-05-15 14:15:35 -07:00
David Christie
f02c7d4391 Merge "Fix issue where GeofenceHardwareImpl can crash. -It can't be instantiated before looper thread is ready. Bug: 21185178" into mnc-dev 2015-05-15 20:50:55 +00:00
Jeff Sharkey
9756d75ec2 Initial pass at storage benchmarks.
Offer an interface for Settings to invoke benchmarks on various
attached volumes.

Bug: 21172095
Change-Id: I847ddc87c58285457d1324be87f70ce10507accb
2015-05-15 13:47:12 -07:00
Wale Ogunwale
4f9fd626d3 Merge "Clean-up broadcast receivers when component is disabled." into mnc-dev 2015-05-15 20:35:40 +00:00
Olawale Ogunwale
358d12a06c Merge "Fix lost singleton provider after force-stopping user or package." into mnc-dev 2015-05-15 20:34:19 +00:00
Olawale Ogunwale
27d8629534 Merge "Also restart provider if there is external handle." into mnc-dev 2015-05-15 20:33:48 +00:00
Wale Ogunwale
ca1c12581a Clean-up broadcast receivers when component is disabled.
Bug: 15804187
Change-Id: Ib672f720bd5c8d81d3846568ef53f7723685f317
2015-05-15 13:33:16 -07:00
David Christie
38feb6f1ec Fix issue where GeofenceHardwareImpl can crash.
-It can't be instantiated before looper thread
 is ready.
Bug: 21185178

Change-Id: I9e5434f7821c608a01bfd962c5482f6c2c2a022d
2015-05-15 13:23:08 -07:00
Yohei Yukawa
79d0c080a0 Merge "Revert "Fix IMMS#mInputShown state inconsistency."" into mnc-dev 2015-05-15 17:40:44 +00:00
Yohei Yukawa
6640d21b2e Revert "Fix IMMS#mInputShown state inconsistency."
This reverts commit 8d4a9117fbd0aaf03b8486ef920c73894a12cfcd.

Because of a regression Bug 21161785.

Bug: 21161785
Bug: 18722991
Bug: 20763994
Bug: 20764441
Bug: 20926844
Change-Id: If58612eda08764be0226832c0a73f03683889cdb
2015-05-15 17:36:53 +00:00
riddle_hsu
5ff8ba7ace Fix lost singleton provider after force-stopping user or package.
Case 1 (name == null):
Switch user from guest to owner. All processes of guest
will be killed, it will not include processes which singleton
components live in, but singleton provider records are still
collected and removed.

When the user switch is complete and the process of removed
singleton provider is still alive, there is someone access
the provider, it will create a new ContentProviderRecord and
wait but no one will notify it because the provider process
is alive with different ContentProviderRecord.

Then the access cannot get response unless the process of target
provider is died and restarted.

Case 2 (name != null):
Switch to another non-guest user, launch an application which
contains singleton provider. Go to Settings to force-stop the
package then switch back to owner user. Launch an application
which will access the singleton provider. It will also cannot
get response that similar as case 1.

Solution:
Only collect singleton provider if target user is all or owner.

Change-Id: Ic6828da66645172d1378cfb1f66d092df5966516
2015-05-15 10:17:21 -07:00
riddle_hsu
dbb902d4ad Also restart provider if there is external handle.
e.g. ContentResolver.getType will call
ActivityManagerService.getProviderMimeType
that will not have connection but increase
externalProcessNoHandleCount.

Change-Id: I649c0b2390a749c77c6be5e7dfadc1acb689ec4c
2015-05-15 09:20:39 -07:00
Dan Sandler
d63f9321e6 Icon support comes to Notification.
And you may ask yourself: what is that beautiful icon?
  And you may ask yourself: where does that API go to?
  And you may ask yourself: is it a resource? is it a Bitmap?
  And you may say to yourself: my god, what have I done

(This patch fixes a number of bugs in the initial
implementation, but other than that, it's the same as it
ever was.)

Bug: 18568715
Bug: 21141842
Change-Id: I1d3f9427abd7f0bb57e533fcfac708851ff644b6
2015-05-15 12:35:21 +00:00
Matthew Williams
af9ea2cf5e Merge "Fix bug with jobservice context giving wrong value" into mnc-dev 2015-05-15 03:51:58 +00:00
Matthew Williams
d9db9d75ef Fix bug with jobservice context giving wrong value
BUG: 20614145
Change-Id: Ibd555732e03646d6d59e6d0effa9f92ec70ca3c4
2015-05-14 20:50:54 -07:00
Lorenzo Colitti
bdc8b6d247 Merge "Statically import NetworkCapabilities constants for brevity." into mnc-dev 2015-05-15 03:37:24 +00:00
Ruben Brunk
096c11dc37 Merge "camera2: Fix work-profile eviction handling." into mnc-dev 2015-05-15 01:45:19 +00:00
Ruben Brunk
7f75da2405 camera2: Fix work-profile eviction handling.
Bug: 20124384

Change-Id: I6fb82dbfd5f98746ed4befed81a583e3709bfee8
2015-05-14 18:39:50 -07:00
Svet Ganov
e650fd95a9 Merge "Fix grant/revoke to act on owner by default and log invalid user id." into mnc-dev 2015-05-14 23:25:10 +00:00
Svet Ganov
4ccca50d7e Fix grant/revoke to act on owner by default and log invalid user id.
bug:21163229

Change-Id: I66d0cc130b37b5752ed06afc73259ed41bfb7830
2015-05-14 16:24:19 -07:00
Jinsuk Kim
f2fb0e73f1 Merge "CEC: Remove obsolete TODOs" into mnc-dev 2015-05-14 22:47:06 +00:00
Jinsuk Kim
4d5648b9c5 CEC: Remove obsolete TODOs
Removed legacy TODOs and the associated hack to enable CEC service
for buggy partner low-level implementation.

Bug: 21153475
Change-Id: I105f77389dd5c604336f86ce375016fa87c86759
2015-05-15 06:43:06 +09:00
Xiaohui Chen
55a302402b Merge "wallpaper: avoid exception when user is not initialized" into mnc-dev 2015-05-14 21:05:36 +00:00
Craig Mautner
e0570201f5 Lock top task if whitelisting arrives after start.
If the DevicePolicyManagerService updates the whitelist after a task
in the whitelist has started then the task won't have started locked.

When the updated whitelist arrives this change automatically locks the
topmost task if it is in the whitelist.

Also more locktask debugging.

Fixes bug 21031298.

Change-Id: I2494af6f2819ca91bc01abc5decb3d1adc088226
2015-05-14 12:54:23 -07:00
Daniel Sandler
9cb90cbbf8 Merge "Revert "Icon support comes to Notification."" into mnc-dev 2015-05-14 16:34:53 +00:00
Daniel Sandler
09e51a739f Revert "Icon support comes to Notification."
This reverts commit 08a04c15245c970856022d0779aa27d4d63cdee3.
This also reverts commit 5bcbf857d129f4513e562801a4e88077b2655ade.

Change-Id: Ia0b0a5339d523581c877822a3a1feec97ae4b73d
2015-05-14 12:23:24 -04:00
Paul McLean
f799491fb4 Merge "New policy for internal and wired device names." into mnc-dev 2015-05-14 15:59:38 +00:00
Paul McLean
fc56b88ac4 Merge "Add manufacturer-provided device name for AudioPort name field for BT devices. Change "a2dp-device" to empty string for EnumAPI." into mnc-dev 2015-05-14 15:59:20 +00:00
Lorenzo Colitti
9e2d14beb3 Merge "Don't display the "no Internet access" prompt on captive portals." into mnc-dev 2015-05-14 15:07:10 +00:00
Lorenzo Colitti
8deb341067 Statically import NetworkCapabilities constants for brevity.
Bug: 18591282
Change-Id: I41c148951724136f31bc663fd81ca9f5de72818a
2015-05-14 23:46:17 +09:00
Lorenzo Colitti
d49159f4e9 Don't display the "no Internet access" prompt on captive portals.
Bug: 20081183
Bug: 21066461
Change-Id: Idc71844a604f9ca655411c6916de256780ea4586
2015-05-14 23:46:16 +09:00
Rubin Xu
6e1c17a3df Merge "clear caller identify before sending system update notification" into mnc-dev 2015-05-14 14:00:18 +00:00
Rubin Xu
2c84cc2ea2 clear caller identify before sending system update notification
Because DeviceAdminReceiver is protected by BIND_DEVICE_ADMIN permission,
in order to send broadcast to it, we need to clear the caller's identity
and call sendBroadcastAsUser() as system.

Bug: 20213644
Change-Id: Icc7b239b9005e286012ade6580ec92a0a57198e0
2015-05-14 13:48:35 +01:00
Wojciech Staszkiewicz
9e9e2e73c6 Pass charset to XmlPullParser.setInput instead of null
Passing null to XmlPullParser.setInput forces it to do additional
work, which can be easily avoided if we know the charset beforehand.

bug: b/20849543

Change-Id: Iaff97be9df2d0f99d7af8f19f65934439c9658e2
2015-05-14 10:24:34 +01:00
Robin Lee
39087b1cec Replace String host:port/url args with Uri arg
Uri provides a stronger guarantee of well-formedness and lets apps do
nice extra things like specifying scheme etc. without twisting any
expectations.

Bug: 20820034
Change-Id: Ia6bbedb74765444920b667d643fb7e1eb6a7292b
2015-05-14 07:15:18 +01:00
Dan Sandler
08a04c1524 Icon support comes to Notification.
And you may ask yourself: what is that beautiful icon?
  And you may ask yourself: where does that API go to?
  And you may ask yourself: is it a resource? is it a Bitmap?
  And you may say to yourself: my god, what have I done

Bug: 18568715
Change-Id: I4377b311c538bd1cf36b3fba22326bae81af40c9
2015-05-13 23:50:43 -04:00
Jeff Brown
0d3b6dbc4c Merge "DO NOT MERGE - Overlay display now support multiple modes." into mnc-dev 2015-05-14 02:52:09 +00:00
Jaesung Chung
f5edb20ae9 Merge "TIF: Add DVB device handling to TvInputManagerService" into mnc-dev 2015-05-14 02:14:37 +00:00
Svetoslav
857c3019ba Merge "Do not allow opting out from the new permission model." into mnc-dev 2015-05-14 02:04:30 +00:00
Jaesung Chung
58739e7584 TIF: Add DVB device handling to TvInputManagerService
Added an API to pass an open file descriptor of DVB devices and
addressed the security issue of setting the permissions on DVB devices
to 0666.

Bug: 20436120
Change-Id: I4649e76084f3356ec22b7e776fb87c6a8fdc00d6
2015-05-14 02:00:06 +00:00
Svetoslav
d965370398 Do not allow opting out from the new permission model.
bug:20525775

Change-Id: I84cd4587db5adb96f6f29148adb242905f53f2dc
2015-05-13 18:54:57 -07:00
Wale Ogunwale
8a2978c9ab Merge "Don't stop animation when starting windows app token changes" into mnc-dev 2015-05-14 01:51:50 +00:00
Wale Ogunwale
8ebc82a63f Don't stop animation when starting windows app token changes
If another activity is starting while we are still animating
the starting window of the previous activity to start, we
transfer the starting window of the old activity to the one that
is currently starting so we don't have to create another starting
window and also to reduce jank from the starting window animation
appearing to restart.

However, there were several conditions that led to the starting
window animation stopping when the transfers app tokens

1. Starting window animator not been removed from the previous
app token animator causing it to finish/remove the starting window
prematurily.
2. Starting window animator not been properly added to the new
app token animator causing the animation not be be picked up.
3. WMS.mSkipAppTransitionAnimation been set to false regardless of if
an app transition was actually prepared in WMS.prepareAppTransition()
4. WMS.mSkipAppTransitionAnimation not been set to true in all cases
where the starting window transfers tokens even though we don't want the
new app to do any transition animation is the starting window is
animating.
5. New app not setting its animation to dummy animation when the next
transition should be skipped due to starting window still animating.
6. Starting window animation been cleared for the new app in
WMS.handleAppTransitionReadyLocked() even for cases where we transferred
the animation from the previous app.

Also, cleaned up some code.

Bug: 20953232
Change-Id: I714d6bdfcdaeeaac29f9d464bab9f3e9c192e937
2015-05-13 18:45:36 -07:00
Amith Yamasani
3d32a1c04d Merge "Allow settings to change app inactive state" into mnc-dev 2015-05-14 01:24:29 +00:00
Fabrice Di Meglio
aef477a65e Merge "Add IntentFilter auto verification - part 11" into mnc-dev 2015-05-14 01:21:57 +00:00
Amith Yamasani
901e924392 Allow settings to change app inactive state
Change-Id: I57efb4b5fa69c9a268025fb1ef83de36c4cc83ca
2015-05-13 18:21:33 -07:00