Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
261,360 Commits 3 Branches 0 Tags
5df6c745c489b4ccdd4daad41b441d3faa04ced8
Commit Graph

261360 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sid Soundararajan
5df6c745c4 Merge "Move onStart update of recents tasks to onResume" into nyc-dev am: 1aae32b44a am: 81505b48e5 
am: 815fe51501

* commit '815fe5150187a069990601b77d7164b4dca898f1':
  Move onStart update of recents tasks to onResume

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

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

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

* commit 'be4434d73f8a8383e3f638cb5109fa0eab6b7c70':

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

* commit '45d4f351ba79e658cb9abc6633b4d7de62e78ffc':
  Make some of the UID-based VPN code reusable

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

* commit '462790bbc3af07f974dabad9985584f815d0721b':

Change-Id: I019228831f508c32db6dd2b5508e99a9213a7348
 2016-05-17 17:55:41 +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
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
Phil Weaver
2a72e8b390 Merge "Hide UiAutomation#destroy as test api." into nyc-dev am: 89d3ba72b7 am: 11ece94702 
am: 3070a2a97c

* commit '3070a2a97c40f78b0f716a92b8428ea9815d3d83':
  Hide UiAutomation#destroy as test api.

Change-Id: I81b65ece02a7b48bbc93d12f032af2bc8cced820
 2016-05-17 17:41:19 +00:00
Chong Zhang
a5b84cfc7b Merge "Apply final crop during surface preservation" into nyc-dev am: 2d4d408a5b am: a409fada63 
am: aead9dbcbf

* commit 'aead9dbcbf94ace7847f0f58ee396e1704317fc4':

Change-Id: I4fbcbc99a6daa7b46f314bbe6d7db4b71ba0893f
 2016-05-17 17:41:15 +00:00
Sergio Giro
81b1b5463a Merge "ZygoteInit: remove extra copy of method" into nyc-mr1-dev-plus-aosp 
am: 7bc107228c

* commit '7bc107228c0a41882f4202e568f48580d24bb7ba':
  ZygoteInit: remove extra copy of method

Change-Id: I93614394b6c5b97ba804bb7949f3c1b6a41ef510
 2016-05-17 17:41:09 +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
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
Chong Zhang
3a78d6773f Merge "Apply final crop during surface preservation" into nyc-dev am: 2d4d408a5b am: 85a3a71e5f 
am: 8a49755b4c

* commit '8a49755b4c84f084ff566365e7efc3abc6de7aec':
  Apply final crop during surface preservation

Change-Id: I02f76536c625d76b2a500e73663e6186bd601521
 2016-05-17 17:34:36 +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
TreeHugger Robot
c16bf253a2 Merge "pm: query both direct boot un/aware activities" 2016-05-17 17:26:51 +00:00
Phil Weaver
affda09d89 Merge "Merge "Content description for FloatingToobar overflow." into nyc-dev am: 43141e33f7 am: efae6e9ff1" into nyc-mr1-dev-plus-aosp 
am: 08ce6540b9

* commit '08ce6540b9e7b161e753b94867661364aa38bd3f':

Change-Id: Ic89f1d0a6311061ea072ef35d6a6bcbbe3174074
 2016-05-17 17:25:42 +00:00
Phil Weaver
1cc8e5f431 Merge "Content description for FloatingToobar overflow." into nyc-dev am: 43141e33f7 am: bc176c4fbf 
am: c0a46cf445

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

Change-Id: I2b4a10f15b5956de083b92d3e892aa80fa782017
 2016-05-17 17:25:38 +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
Phil Weaver
efae6e9ff1 Merge "Content description for FloatingToobar overflow." into nyc-dev 
am: 43141e33f7

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

Change-Id: Id7656042c60e76a5afa593df1613e1a609366507
 2016-05-17 17:15:25 +00:00
Sergio Giro
f54863f8bb ZygoteInit: remove extra copy of method DO NOT MERGE ANYWHERE am: 57b8a73d0e -s ours 
am: 1110d6375a  -s ours

* commit '1110d6375aee846beddd1743d3d99312f901d6e4':
  ZygoteInit: remove extra copy of method DO NOT MERGE ANYWHERE

Change-Id: I59feb5170397b1124eb49fad3cc710c75876b1ea
 2016-05-17 17:12:49 +00:00
Sergio Giro
1110d6375a ZygoteInit: remove extra copy of method DO NOT MERGE ANYWHERE 
am: 57b8a73d0e  -s ours

* commit '57b8a73d0eb554eff12f6f6bc8d85cbc81897f0c':
  ZygoteInit: remove extra copy of method DO NOT MERGE ANYWHERE

Change-Id: Ibb39e97681e808220d723c0b14aa24ac9f53c90c
 2016-05-17 17:09:30 +00:00
Phil Weaver
43141e33f7 Merge "Content description for FloatingToobar overflow." into nyc-dev 2016-05-17 17:08:29 +00:00
TreeHugger Robot
c044558d86 Merge "Fix some trivial warnings in WifiP2pDevice.java" 2016-05-17 16:56:52 +00:00
Sergio Giro
57b8a73d0e ZygoteInit: remove extra copy of method DO NOT MERGE ANYWHERE 
The method warmUpJcaProviders arrived here from both nyc-dev
and aosp/master, removing duplication.

Change-Id: I2d91ee38fe93f600bec89651416e84ab83ef9d4a
 2016-05-17 17:55:27 +01:00
Steven Ng
1a373e4c82 Merge "Enforce permission before checking OEM unlocking setting" into nyc-mr1-dev am: 914411a1e2 
am: 7d5ee712cd

* commit '7d5ee712cd8246daae14958cb6d83b1901342cf6':
  Enforce permission before checking OEM unlocking setting

Change-Id: Ieefb194300a6ffaded46fbe18370dec88da2ad4d
 2016-05-17 16:47:35 +00:00
Steven Ng
7d5ee712cd Merge "Enforce permission before checking OEM unlocking setting" into nyc-mr1-dev 
am: 914411a1e2

* commit '914411a1e2bdf802dcb04202686f446056ee2da9':
  Enforce permission before checking OEM unlocking setting

Change-Id: I7060bee9cb58d45985e3a9f9a6de21b0aa1ba1ed
 2016-05-17 16:42:13 +00:00
Steven Ng
914411a1e2 Merge "Enforce permission before checking OEM unlocking setting" into nyc-mr1-dev 2016-05-17 16:38:19 +00:00
Xiaohui Chen
bb803cf2f6 pm: query both direct boot un/aware activities 
Bug: 28762791
Change-Id: I64009c75ae7ac8784e739349b70d0413f0b4681a
 2016-05-17 16:24:18 +00:00
Philip P. Moltmann
e66baed387 Merge "Only have a single call into pdfium at a time." 2016-05-17 16:22:55 +00:00