Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
266,851 Commits 3 Branches 0 Tags
23c2ec20b7ca01acbcc2c322256fe1afee62c8ea
Commit Graph

266851 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jae Seo
18c0cfb075 TIF: Throw a more appropriate runtime exception when building TvInputInfo 
Bug: 28775591
Change-Id: I934c8d7fed3dda356cdc3bafe51a79f585918ed0
 2016-05-17 10:06:36 -07:00
Michael Wright
778e3b91ac DO NOT MERGE Remove Pointer Capture API 
The underlying implementation needs to be completely rethought. If a
process crashed while you were in pointer capture mode, you were
pretty much stuck in it. If the mouse happened to move outside of
your bounds right before you called the API, you'd never actually get
an event (whatever it was hovering over would). There's no easy way
for the system to tell you when you enter or exit this mode because
it doesn't actually track who the current request is from.

These are all solvable, but not in the N time frame. Maybe next time.

Bug: 26830970
Change-Id: I03efd63c499b86dc278491ca3284566c1965581f
 2016-05-17 18:02:37 +01:00
Michael Wright
f9d9ce7705 DO NOT MERGE Rename PointerIcon and Pointer Capture APIs 
This is a response to API council feedback.

Bug: 26830970
Change-Id: Ia2d284b5c1ab8365bedfdc37d129be4b8146036b
 2016-05-17 18:02:32 +01: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
Wale Ogunwale
6874114a95 Correct activity lifecycle when forcedResize activity is finished 
- Regerssion introduced ag/1039265. We still need to resume the
starting activity in a task with an overlay activity is the starting
activity is the overlay activity. Otherwise the activity below it
might not be moved to the paused state.
- Also, we don't want to clear starting window for activities that
aren't behind fullscreen activities as we need to display their
starting window until they are done initializing.

Bug: 28808506
Bug: 28751186
Change-Id: I9a1a5feecea2ed3592a4064fca80e240a3bce387
 2016-05-17 09:40:02 -07:00
Steven Ng
914411a1e2 Merge "Enforce permission before checking OEM unlocking setting" into nyc-mr1-dev 2016-05-17 16:38:19 +00:00
Felipe Leme
a701cad320 Use batching to set firewall rules. 
Netd now provides an option to flush all uids for a given firewall
chain. Using this option is particularly useful when setting the
fw_standby chain, since over time the device will have dozens of idle
apps.

For example, in a Nexus 5X with 45 idle apps, setFirewallUidRules() at
boot was taking 1044ms, and after this change it dropped to just 32ms.

BUG: 26675191
Change-Id: I7016ba646b872f80d0b27a56b867c0b6080d2516
 2016-05-17 09:31:00 -07: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
Sergio Giro
d91f7f4e71 Merge "ZygoteInit: warm up JCA providers during preload" am: aa733e0b41 am: ef42102cf8 am: 9d95ab47ff 
am: 093adbb330

* commit '093adbb3304098eb8d336ff2bebef335dc94bbb1':
  ZygoteInit: warm up JCA providers during preload

Change-Id: Ib039242b086ee995e9428db043cce47a13860cba
 2016-05-17 16:12:43 +00:00
Sergio Giro
093adbb330 Merge "ZygoteInit: warm up JCA providers during preload" am: aa733e0b41 am: ef42102cf8 
am: 9d95ab47ff

* commit '9d95ab47ff318ebb30804dce0890b4de414d5844':
  ZygoteInit: warm up JCA providers during preload

Change-Id: I0c987173ffc212581b21958091e288de531e3e97
 2016-05-17 16:06:43 +00:00
Sergio Giro
9d95ab47ff Merge "ZygoteInit: warm up JCA providers during preload" am: aa733e0b41 
am: ef42102cf8

* commit 'ef42102cf8d0dd238deb1871bef07f9646622a91':
  ZygoteInit: warm up JCA providers during preload

Change-Id: I7c8ed5394af0c6e1fd25b289ca615125c4e3c38e
 2016-05-17 16:01:45 +00:00
Sergio Giro
ef42102cf8 Merge "ZygoteInit: warm up JCA providers during preload" 
am: aa733e0b41

* commit 'aa733e0b41e4e15908a4c89e935f824cc5908b4d':
  ZygoteInit: warm up JCA providers during preload

Change-Id: If96e2e482e3fc01c2d3be5eee6d405f9bb5a6571
 2016-05-17 15:56:32 +00:00
Sergio Giro
aa733e0b41 Merge "ZygoteInit: warm up JCA providers during preload" 2016-05-17 15:50:50 +00:00
Zoltan Szatmary-Ban
e354dbdb63 Merge "Merge "Introduce system API to get source of user restriction" into nyc-dev am: 690c2ea117 am: fc66ec971c" into nyc-mr1-dev-plus-aosp 
am: 617ac65092

* commit '617ac650929fb0db99f75a6f4bc4489c727090e8':

Change-Id: Id2e0cbbcd5c8acc6a586c967c49bb6d175aede1d
 2016-05-17 15:33:35 +00:00
Zoltan Szatmary-Ban
e0267426c2 Merge "Introduce system API to get source of user restriction" into nyc-dev am: 690c2ea117 am: 07e232371f 
am: 96489e0c2a

* commit '96489e0c2a370b970fc243a23ccfb3e0a73d0298':
  Introduce system API to get source of user restriction

Change-Id: Id368f8b1a096a86195097ba87a18539f0558a72a
 2016-05-17 15:33:28 +00:00
Android Build Merger (Role)
617ac65092 Merge "Merge "Introduce system API to get source of user restriction" into nyc-dev am: 690c2ea117 am: fc66ec971c" into nyc-mr1-dev-plus-aosp 2016-05-17 15:30:28 +00:00
Zoltan Szatmary-Ban
c9605c4b3f Merge "Introduce system API to get source of user restriction" into nyc-dev am: 690c2ea117 
am: fc66ec971c

* commit 'fc66ec971cf67773bc99553881c480db26221165':
  Introduce system API to get source of user restriction

Change-Id: Ie80d7671efcb1c7d00ab32d4762dd795c43b9281
 2016-05-17 15:30:01 +00:00
Zoltan Szatmary-Ban
96489e0c2a Merge "Introduce system API to get source of user restriction" into nyc-dev am: 690c2ea117 
am: 07e232371f

* commit '07e232371f5249de1c8fe4d8ac277b22b646576c':
  Introduce system API to get source of user restriction

Change-Id: Iaec13f6b56a138b67a066c9eb1c234a7a653c4bd
 2016-05-17 15:29:25 +00:00
Zoltan Szatmary-Ban
07e232371f Merge "Introduce system API to get source of user restriction" into nyc-dev 
am: 690c2ea117

* commit '690c2ea117f90b7759ac280a1c84f5966b1e7938':
  Introduce system API to get source of user restriction

Change-Id: Iec3a08471bc56a3aec1aff43b3c7361931c13539
 2016-05-17 15:24:20 +00:00
Zoltan Szatmary-Ban
fc66ec971c Merge "Introduce system API to get source of user restriction" into nyc-dev 
am: 690c2ea117

* commit '690c2ea117f90b7759ac280a1c84f5966b1e7938':
  Introduce system API to get source of user restriction

Change-Id: Iab98753f85774d741c5126395d56af194c8b0ca8
 2016-05-17 15:23:59 +00:00
Zoltan Szatmary-Ban
690c2ea117 Merge "Introduce system API to get source of user restriction" into nyc-dev 2016-05-17 15:16:56 +00:00
Shibin George
ff8899b41a Merge "Synchronize access of mSubscriptions" am: d065220a54 am: 8434b4cf1b am: 6e22f2dad1 
am: 9ed59cfd9c

* commit '9ed59cfd9c8a9126504ac15b98ff0b17ccca436b':
  Synchronize access of mSubscriptions

Change-Id: I172338ca1f47a89515bf8456138773b11ae0dbae
 2016-05-17 14:27:34 +00:00
Shibin George
9ed59cfd9c Merge "Synchronize access of mSubscriptions" am: d065220a54 am: 8434b4cf1b 
am: 6e22f2dad1

* commit '6e22f2dad1647be6481861f8225174bab26ba7a5':
  Synchronize access of mSubscriptions

Change-Id: Ic68abe3de06f8fb472ecf3e2854c75b69aaff584
 2016-05-17 14:24:48 +00:00
Shibin George
6e22f2dad1 Merge "Synchronize access of mSubscriptions" am: d065220a54 
am: 8434b4cf1b

* commit '8434b4cf1b0c78cc371bab445edeb2d0992b571e':
  Synchronize access of mSubscriptions

Change-Id: I95c81631a171257594adc0af47e0a436d560d20e
 2016-05-17 14:19:59 +00:00
Shibin George
8434b4cf1b Merge "Synchronize access of mSubscriptions" 
am: d065220a54

* commit 'd065220a547c985be3bd17bb8f2ff473427aa978':
  Synchronize access of mSubscriptions

Change-Id: I5b28986dd770abbeeb9aaff872577230c3b56abd
 2016-05-17 14:14:59 +00:00
Treehugger Robot
d065220a54 Merge "Synchronize access of mSubscriptions" 2016-05-17 14:07:15 +00:00