Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
256,895 Commits 3 Branches 0 Tags
87f3aeeee2a9859cd312c3f1d8a18946cf8f582b
Commit Graph

256895 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
607844efa5 Merge "Fix issue #27532364: Security Vulnerability in IIntentSender.send" into nyc-dev 2016-05-17 18:19:36 +00:00
Dianne Hackborn
777a06d3c9 Fix issue #28641630: Service client dumps are timing out for no reason 
Actually, no reason.  The reason is that to do the dump we are doing
synchronous calls out to each service, but that is with the activity
manager lock held, so they can get blocked if their main thread does
any call back in to the activity manager.

To fix this, re-organize the dumping code so that the "with client"
path is separate, and doesn't require holding a lock the entire
time.

Change-Id: Ia96861c10da81048b3d2ac93a25760b68623cf34
 2016-05-17 11:19:03 -07:00
Wale Ogunwale
c46cc608bc Merge "Correct activity lifecycle when forcedResize activity is finished" into nyc-dev 
am: 4570df8fd5

* commit '4570df8fd52b4ca8fab00794297a4f3d3923bbfb':
  Correct activity lifecycle when forcedResize activity is finished

Change-Id: I0cbcab2b84c32b0c8add13ddbb9cc7984d18a61f
 2016-05-17 18:17:15 +00:00
Bert McMeen
26599cc0e2 docs: Wear preview - update to leftnav 
am: ca23070a46

* commit 'ca23070a460ff8cc8942b28d72de341d10102d4c':
  docs: Wear preview - update to leftnav

Change-Id: If391f05219140dbc8f9adcb337b599c48383a82c
 2016-05-17 18:17:11 +00:00
Michael Kwan
4fab094b07 Merge "Modified AlertController to allow themes to specify custom implementation." into nyc-mr1-dev 
am: 59bce44aaa

* commit '59bce44aaaad61c5bd57ddcc1225e69ad5d0500b':
  Modified AlertController to allow themes to specify custom implementation.

Change-Id: Ice8251602843a6a98552bcb85272d8cc9eefae2b
 2016-05-17 18:14:47 +00:00
Makoto Onuki
37d5cb3181 Merge "ShortcutManager: API changes for DR" into nyc-mr1-dev 
am: 8295332d83

* commit '8295332d83d1e664a7ef3a731370ae71242688a1':
  ShortcutManager: API changes for DR

Change-Id: I0006667d4bbe2fa92015ac442ae1e8362cbcacbd
 2016-05-17 18:14:39 +00:00
Wale Ogunwale
257c1d882a Merge "Correct activity lifecycle when forcedResize activity is finished" into nyc-dev 
am: 4570df8fd5

* commit '4570df8fd52b4ca8fab00794297a4f3d3923bbfb':
  Correct activity lifecycle when forcedResize activity is finished

Change-Id: I985e8154e396a7a7da91939840f224a1885a792e
 2016-05-17 18:14:25 +00:00
Daniel Nishi
b4d5b71cfb Merge "Add new action for the storage manager settings." into nyc-mr1-dev 2016-05-17 18:10:52 +00:00
Jorim Jaggi
c5887ea7a0 Fix janky multi-window entry animation 
- Add tracing when drawing ImageWallpaper.
- Don't force a redraw in onSurfaceRedrawNeeded. This only adds
another unnecessary draw and doesn't do anything useful.
onSurfaceRedrawNeeded is only here so the client can block.
- Delay entrance animation by one frame so wallpaper can be drawn
before the transition is starting.
- Add some delay for animating the tasks up in recents to match that
delay (it wasn't matched before at all).
- Fix an issue where launchedFromHome was wrong while docking.

Bug: 28769940
Change-Id: I2b763ed40078541328a1e04ffecf5b0a520fe019
 2016-05-17 18:10:31 +00:00
Michael Kwan
59bce44aaa Merge "Modified AlertController to allow themes to specify custom implementation." into nyc-mr1-dev 2016-05-17 18:03:38 +00:00
TreeHugger Robot
4570df8fd5 Merge "Correct activity lifecycle when forcedResize activity is finished" into nyc-dev 2016-05-17 18:02:19 +00:00
Makoto Onuki
8295332d83 Merge "ShortcutManager: API changes for DR" into nyc-mr1-dev 2016-05-17 18:01:29 +00:00
Amit Mahajan
08daeb57c7 Merge "OMADM intent sent by both system and apps." into nyc-dev am: 65ca16ebab 
am: 4e36794b49

* commit '4e36794b49943d01eefa39443d7225f7b8c7a448':

Change-Id: I58e2e339071beb15d7edf0b497e6056aee9950ef
 2016-05-17 17:59:56 +00:00
Sid Soundararajan
f00ef850ae Merge "Move onStart update of recents tasks to onResume" into nyc-dev am: 1aae32b44a 
am: 4b19273c81

* commit '4b19273c8123b1c4c8ab9c239609e52c1399b17d':

Change-Id: I55a2e2f6add74678e0f3656eec153a69e49ca836
 2016-05-17 17:59:50 +00:00
Sid Soundararajan
6d0de2067d Merge "Add an extra to HOME intent to indicate it comes form recents." into nyc-dev am: ea98d35d62 
am: 1f07c85fa8

* commit '1f07c85fa8db7bf24cfabccab76f1d6b798ec7e9':

Change-Id: Ia49c50aba245d2eef88a5fe95a68d34765fac46c
 2016-05-17 17:59:43 +00:00
Bert McMeen
ca23070a46 docs: Wear preview - update to leftnav 
Bug: 28317997
Change-Id: Ia7b2f39dbd27106fd621acbf9e59f558ee7bdeba
 2016-05-17 10:58:06 -07:00
Amit Mahajan
1a4329a9b2 Merge "OMADM intent sent by both system and apps." into nyc-dev am: 65ca16ebab 
am: db4c3aff33

* commit 'db4c3aff334c0cebea1e337fadb4b535e8ccaffa':
  OMADM intent sent by both system and apps.

Change-Id: I7bbe6a5deee8bd2eeb0e7b59763ddfb6d615bc1f
 2016-05-17 17:55:15 +00:00
Sid Soundararajan
815fe51501 Merge "Move onStart update of recents tasks to onResume" into nyc-dev am: 1aae32b44a 
am: 81505b48e5

* commit '81505b48e5c00e067d684b39de73b93aeaffefb2':
  Move onStart update of recents tasks to onResume

Change-Id: I39af26412ea8184803c226b285b11857619ab74b
 2016-05-17 17:55:11 +00:00
Sid Soundararajan
115bcb270c Merge "Add an extra to HOME intent to indicate it comes form recents." into nyc-dev am: ea98d35d62 
am: a41fcf5449

* commit 'a41fcf54499272e185733f5ee23ef3f51cb4fda5':
  Add an extra to HOME intent to indicate it comes form recents.

Change-Id: I46cef20f7d8aa8b4b2af875c1eb609a347efac04
 2016-05-17 17:55:06 +00:00
Robin Lee
be4434d73f Merge "Make some of the UID-based VPN code reusable" into nyc-dev am: 4920698e17 
am: 0867543a06

* commit '0867543a064a48a1aca6243a3d1cdf7a12ad94c8':

Change-Id: I3a72f7329b896aa0c107ddf823aafd4480042f29
 2016-05-17 17:55:00 +00:00
Robin Lee
45d4f351ba Merge "Make some of the UID-based VPN code reusable" into nyc-dev am: 4920698e17 
am: 607fa836b2

* commit '607fa836b2b60f411ae239bff5391dcaafbbc799':
  Make some of the UID-based VPN code reusable

Change-Id: Ie7c88ba3eebe4af85a69f330cae3df3293113d4e
 2016-05-17 17:52:45 +00:00
Amit Mahajan
4e36794b49 Merge "OMADM intent sent by both system and apps." into nyc-dev 
am: 65ca16ebab

* commit '65ca16ebab701c82895a0f1bf5ba0344aff44e50':
  OMADM intent sent by both system and apps.

Change-Id: Icd3a9e9b35a2f4c44269fef2bbbe8d6835d93990
 2016-05-17 17:49:56 +00:00
Sid Soundararajan
4b19273c81 Merge "Move onStart update of recents tasks to onResume" into nyc-dev 
am: 1aae32b44a

* commit '1aae32b44abd189c905c4ac799422829ce24b186':
  Move onStart update of recents tasks to onResume

Change-Id: I69d1a4d72796f7940a0993560f78fa0e6c667f78
 2016-05-17 17:49:53 +00:00
Sid Soundararajan
1f07c85fa8 Merge "Add an extra to HOME intent to indicate it comes form recents." into nyc-dev 
am: ea98d35d62

* commit 'ea98d35d62ec9e8273e5e632feec167c24a90a15':
  Add an extra to HOME intent to indicate it comes form recents.

Change-Id: I441ff96ed9c5e84aee38e68b5a153c3a39f3d63b
 2016-05-17 17:49:50 +00:00
Phil Weaver
462790bbc3 Merge "Hide UiAutomation#destroy as test api." into nyc-dev am: 89d3ba72b7 
am: bcaaac3ea1

* commit 'bcaaac3ea106a2f1c2ffcba5c3419bf10cefd5e1':

Change-Id: I518d777ee641a8a24044f07b6afdd97ee70db5c3
 2016-05-17 17:49:21 +00:00
Amit Mahajan
db4c3aff33 Merge "OMADM intent sent by both system and apps." into nyc-dev 
am: 65ca16ebab

* commit '65ca16ebab701c82895a0f1bf5ba0344aff44e50':
  OMADM intent sent by both system and apps.

Change-Id: Ifda48558713ea89d0d1b2de54b1abb738ca187e8
 2016-05-17 17:48:44 +00:00
Amit Mahajan
65ca16ebab Merge "OMADM intent sent by both system and apps." into nyc-dev 2016-05-17 17:41:11 +00:00
Sid Soundararajan
81505b48e5 Merge "Move onStart update of recents tasks to onResume" into nyc-dev 
am: 1aae32b44a

* commit '1aae32b44abd189c905c4ac799422829ce24b186':
  Move onStart update of recents tasks to onResume

Change-Id: Ifb377d9da719f2994aa34bb9bf990db9464adf4f
 2016-05-17 17:39:19 +00:00
Sid Soundararajan
a41fcf5449 Merge "Add an extra to HOME intent to indicate it comes form recents." into nyc-dev 
am: ea98d35d62

* commit 'ea98d35d62ec9e8273e5e632feec167c24a90a15':
  Add an extra to HOME intent to indicate it comes form recents.

Change-Id: I683f2f9307271e6179b91097204314815aac4a8e
 2016-05-17 17:39:17 +00:00
Robin Lee
0867543a06 Merge "Make some of the UID-based VPN code reusable" into nyc-dev 
am: 4920698e17

* commit '4920698e17dc8aacd1b0743d313383a8ee1a3400':
  Make some of the UID-based VPN code reusable

Change-Id: I0e5b9aa4552ee11ae5ec2d2206cc58487fb9cd4c
 2016-05-17 17:39:14 +00:00
Wale Ogunwale
e76407c7f3 Make Recents activity invisible when it is behind a translucent activity 
We don't want the recents activity to be visible behind a translucent
fullscreen activity. Instead we want to show the home activity behind
the translucent activity.

Bug: 28246419
Change-Id: I0364a592d7d84c88b39b359431492d0395b0f051
 2016-05-17 10:38:02 -07:00
Sid Soundararajan
1aae32b44a Merge "Move onStart update of recents tasks to onResume" into nyc-dev 2016-05-17 17:36:50 +00:00
Robin Lee
607fa836b2 Merge "Make some of the UID-based VPN code reusable" into nyc-dev 
am: 4920698e17

* commit '4920698e17dc8aacd1b0743d313383a8ee1a3400':
  Make some of the UID-based VPN code reusable

Change-Id: I3f1b1a08059aa58cb76db6cdd070b103024b9bf3
 2016-05-17 17:36:43 +00:00
Sid Soundararajan
ea98d35d62 Merge "Add an extra to HOME intent to indicate it comes form recents." into nyc-dev 2016-05-17 17:36:42 +00:00
Phil Weaver
bcaaac3ea1 Merge "Hide UiAutomation#destroy as test api." into nyc-dev 
am: 89d3ba72b7

* commit '89d3ba72b7f3318d8911b136af306375051c828a':
  Hide UiAutomation#destroy as test api.

Change-Id: Ie68602fc2b301430dcfa98d4b61515f2014db71a
 2016-05-17 17:36:17 +00:00
Phil Weaver
3070a2a97c Merge "Hide UiAutomation#destroy as test api." into nyc-dev am: 89d3ba72b7 
am: 11ece94702

* commit '11ece94702f68f96af44cf7aafca462709bf4937':
  Hide UiAutomation#destroy as test api.

Change-Id: I06c78c7bb99268ea3fd559990d2acde3e611f3ab
 2016-05-17 17:35:24 +00:00
Chong Zhang
aead9dbcbf Merge "Apply final crop during surface preservation" into nyc-dev am: 2d4d408a5b 
am: a409fada63

* commit 'a409fada63a49a959d54d642aaeafaef2ffdcc13':

Change-Id: Iad84d62eeac30b180a3987023011001a70b76943
 2016-05-17 17:35:17 +00:00
Phil Weaver
11ece94702 Merge "Hide UiAutomation#destroy as test api." into nyc-dev 
am: 89d3ba72b7

* commit '89d3ba72b7f3318d8911b136af306375051c828a':
  Hide UiAutomation#destroy as test api.

Change-Id: I91cbc4571a110be81f1c25fc0f19fed81d3b2819
 2016-05-17 17:32:24 +00:00
Sergio Giro
7bc107228c Merge "ZygoteInit: remove extra copy of method" into nyc-mr1-dev-plus-aosp 2016-05-17 17:30:50 +00:00
Chong Zhang
8a49755b4c Merge "Apply final crop during surface preservation" into nyc-dev am: 2d4d408a5b 
am: 85a3a71e5f

* commit '85a3a71e5fef6091723c760bf1e43752bf1ed5bc':
  Apply final crop during surface preservation

Change-Id: I815a7fac6c481f201f03fbbb4ba061edf8cc1285
 2016-05-17 17:30:15 +00:00
TreeHugger Robot
4920698e17 Merge "Make some of the UID-based VPN code reusable" into nyc-dev 2016-05-17 17:30:01 +00:00
Sergio Giro
d498859c4a ZygoteInit: remove extra copy of method 
The method warmUpJcaProviders arrived here from both nyc-dev
and aosp/master, removing duplication.

(cherry picked from commit 57b8a73d0e)

Change-Id: Idbb046ae47d608343ffb5cbf2df8e0c00920c909
 2016-05-17 18:27:56 +01:00
Phil Weaver
89d3ba72b7 Merge "Hide UiAutomation#destroy as test api." into nyc-dev 2016-05-17 17:27:01 +00:00
Chong Zhang
85a3a71e5f Merge "Apply final crop during surface preservation" into nyc-dev 
am: 2d4d408a5b

* commit '2d4d408a5be45b027e43fee99cc3a44b6a556c66':
  Apply final crop during surface preservation

Change-Id: I9f4f6bbb2ededda8a0836d64d73fcefda2b0f946
 2016-05-17 17:25:09 +00:00
Chong Zhang
a409fada63 Merge "Apply final crop during surface preservation" into nyc-dev 
am: 2d4d408a5b

* commit '2d4d408a5be45b027e43fee99cc3a44b6a556c66':
  Apply final crop during surface preservation

Change-Id: Ica109f6bffb84ad1dc182a366be2d1fd9a1d17f1
 2016-05-17 17:25:04 +00:00
Android Build Merger (Role)
08ce6540b9 Merge "Merge "Content description for FloatingToobar overflow." into nyc-dev am: 43141e33f7 am: efae6e9ff1" into nyc-mr1-dev-plus-aosp 2016-05-17 17:22:41 +00:00
Phil Weaver
18a252ecc3 Merge "Content description for FloatingToobar overflow." into nyc-dev am: 43141e33f7 
am: efae6e9ff1

* commit 'efae6e9ff1db805b201f05f4e579aee493421ce2':
  Content description for FloatingToobar overflow.

Change-Id: I66bc1db59742678b5241cf9929099117d97c5b48
 2016-05-17 17:22:14 +00:00
Phil Weaver
c0a46cf445 Merge "Content description for FloatingToobar overflow." into nyc-dev am: 43141e33f7 
am: bc176c4fbf

* commit 'bc176c4fbf3ab075343699f57c5fc2583549e865':
  Content description for FloatingToobar overflow.

Change-Id: Ic8ab8de6fcb433e26e811f87df3ab99e93dc054c
 2016-05-17 17:22:01 +00:00
Chong Zhang
2d4d408a5b Merge "Apply final crop during surface preservation" into nyc-dev 2016-05-17 17:17:52 +00:00
Phil Weaver
bc176c4fbf Merge "Content description for FloatingToobar overflow." into nyc-dev 
am: 43141e33f7

* commit '43141e33f7e7da5b7514549cf23f5228915f11d8':
  Content description for FloatingToobar overflow.

Change-Id: I6118131870a8c3bfa51befa9973808fadfa9caf6
 2016-05-17 17:16:46 +00:00