Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
255,060 Commits 3 Branches 0 Tags
bbcc2b39bd561bc49a14fa4656dd14ff234e5689
Commit Graph

65099 Commits

Author SHA1 Message Date
Michael Wright
5d2ea237d4 Merge "DO NOT MERGE Rename PointerIcon and Pointer Capture APIs" into nyc-dev am: a1e0cebf3a 
am: 1831ca8f04

* commit '1831ca8f04e117a49227e1b3dc0c8ba1dde06cd5':
  DO NOT MERGE Rename PointerIcon and Pointer Capture APIs

Change-Id: Iebfbc1de1bbf2f86e62ed2105c30e89239368b11
 2016-05-19 15:23:45 +00:00
Michael Wright
1831ca8f04 Merge "DO NOT MERGE Rename PointerIcon and Pointer Capture APIs" into nyc-dev 
am: a1e0cebf3a

* commit 'a1e0cebf3a18ac097d370e21d698e079f974bfff':
  DO NOT MERGE Rename PointerIcon and Pointer Capture APIs

Change-Id: I20532a3148a99d4ea91ba7dc050f8669d5f19400
 2016-05-19 15:12:30 +00:00
TreeHugger Robot
a1e0cebf3a Merge "DO NOT MERGE Rename PointerIcon and Pointer Capture APIs" into nyc-dev 2016-05-19 15:03:36 +00:00
Andrii Kulian
e78cbe1770 Merge "Workaround for ignored resizeableActivity param" into nyc-dev am: 005f9a73fb 
am: 6b21f45add

* commit '6b21f45add49cdacaad9e75cbba332fa3b63522c':
  Workaround for ignored resizeableActivity param

Change-Id: Ia8dc3606ff13b1358d657a8280820ed542cb4781
 2016-05-19 08:09:07 +00:00
Andrii Kulian
6b21f45add Merge "Workaround for ignored resizeableActivity param" into nyc-dev 
am: 005f9a73fb

* commit '005f9a73fbecdb8d0d05eb699d0f02d745110495':
  Workaround for ignored resizeableActivity param

Change-Id: Ia524867cac9118b6dbe5c7c210cd1a1753fe53e1
 2016-05-19 08:06:02 +00:00
Andrii Kulian
005f9a73fb Merge "Workaround for ignored resizeableActivity param" into nyc-dev 2016-05-19 07:57:20 +00:00
Erik Kline
f99efa7e75 Merge "DHCPv4: lease expiration is fatal, renew failures are not" into nyc-dev am: c21f84dddb 
am: 8958153ac7

* commit '8958153ac7921349dd8770a33484ca96581277cc':
  DHCPv4: lease expiration is fatal, renew failures are not

Change-Id: I314ceed6380af58fb3f6308dde11f2d29b324c66
 2016-05-19 04:24:16 +00:00
Erik Kline
ae53fb4a43 Merge "DHCPv4: lease expiration is fatal, renew failures are not" into nyc-dev 
am: c21f84dddb

* commit 'c21f84dddbe8144bb3d392b3b91c6df5f48aed42':
  DHCPv4: lease expiration is fatal, renew failures are not

Change-Id: Ic99edb732d532da27c042824e5ca07c4b35ccfa1
 2016-05-19 04:21:17 +00:00
Erik Kline
8958153ac7 Merge "DHCPv4: lease expiration is fatal, renew failures are not" into nyc-dev 
am: c21f84dddb

* commit 'c21f84dddbe8144bb3d392b3b91c6df5f48aed42':
  DHCPv4: lease expiration is fatal, renew failures are not

Change-Id: I10ed64f309794ed7a18e16f22fa75bc63707998c
 2016-05-19 04:21:15 +00:00
Erik Kline
c21f84dddb Merge "DHCPv4: lease expiration is fatal, renew failures are not" into nyc-dev 2016-05-19 04:12:40 +00:00
Andreas Gampe
36061b85ff Merge "Frameworks/base: Optimize LoadedApk" into nyc-dev am: 8cb3b2bb5c 
am: 3fbf298984

* commit '3fbf29898459d3b6d9fa1680c02650fd692c32e6':
  Frameworks/base: Optimize LoadedApk

Change-Id: Id57874836bd9a4e13b57cad2fdc1ff28d6a8f19c
 2016-05-19 03:55:17 +00:00
Andreas Gampe
3fbf298984 Merge "Frameworks/base: Optimize LoadedApk" into nyc-dev 
am: 8cb3b2bb5c

* commit '8cb3b2bb5c49322cef07931a0ee14c99da5e4b0b':
  Frameworks/base: Optimize LoadedApk

Change-Id: Id11e7e9114403ab70c83601f1988f098d5728a5b
 2016-05-19 03:51:39 +00:00
Andreas Gampe
fcbc43b70a Merge "Frameworks/base: Optimize LoadedApk" into nyc-dev 
am: 8cb3b2bb5c

* commit '8cb3b2bb5c49322cef07931a0ee14c99da5e4b0b':
  Frameworks/base: Optimize LoadedApk

Change-Id: I3cefc230805bc11051acbf3b92382be2aa8dd273
 2016-05-19 03:51:37 +00:00
TreeHugger Robot
8cb3b2bb5c Merge "Frameworks/base: Optimize LoadedApk" into nyc-dev 2016-05-19 03:43:08 +00:00
Andrii Kulian
c59e70d520 Merge "Rename minWidth/Height attributes" into nyc-dev am: 42b3acf9d3 
am: 81ce16a2e6

* commit '81ce16a2e690fbe808ae4546e0c9b814a7ff2e3d':
  Rename minWidth/Height attributes

Change-Id: I927c32ddf2522de03c6b5a75aa6b80537adf1d38
 2016-05-19 01:53:09 +00:00
Andrii Kulian
1699b51cbe Merge "Rename minWidth/Height attributes" into nyc-dev 
am: 42b3acf9d3

* commit '42b3acf9d3eed15324bfa67e92ad751a10e45718':
  Rename minWidth/Height attributes

Change-Id: Id7d89884ea46b3900459af10f5b4a4b32139ddd8
 2016-05-19 01:48:29 +00:00
Andrii Kulian
81ce16a2e6 Merge "Rename minWidth/Height attributes" into nyc-dev 
am: 42b3acf9d3

* commit '42b3acf9d3eed15324bfa67e92ad751a10e45718':
  Rename minWidth/Height attributes

Change-Id: I1710ea3bec982917ce0d163f56b07042a5869281
 2016-05-19 01:48:19 +00:00
Andrii Kulian
42b3acf9d3 Merge "Rename minWidth/Height attributes" into nyc-dev 2016-05-19 01:42:15 +00:00
Andrii Kulian
3f8dc15861 Workaround for ignored resizeableActivity param 
If <uses-sdk> tag is below <application> in AndroidManifest.xml then,
when activity is parsed, targetSdkVersion param is not yet set correctly.
Because of that we're defaulting to RESIZE_MODE_FORCE_RESIZEABLE and the
param resizeableActivity will be ignored.
This CL checks if resizeableActivity was set explicitly when targetSdkVersion
is less than N (or not set).

Bug: 28020462
Change-Id: I099f6c00dd50547ddea873e47dbb447869d0be6f
 2016-05-18 17:49:26 -07:00
Andreas Gampe
f466f7bbd5 Merge "Frameworks/base: Add more systrace points" into nyc-dev am: b40bcfb6ad 
am: 54748384ea

* commit '54748384ea3e001cbc97ecdf67501c8592925df7':
  Frameworks/base: Add more systrace points

Change-Id: I4a3b4143a87c5e928d7149d57a899af0c0aecb0b
 2016-05-19 00:19:48 +00:00
Andreas Gampe
e289467a1e Merge "Frameworks/base: Add more systrace points" into nyc-dev 
am: b40bcfb6ad

* commit 'b40bcfb6ad3d60e5606f41c6628c133512e0538e':
  Frameworks/base: Add more systrace points

Change-Id: Id090c0545a17beb45bafd05f5302298e09ea30cd
 2016-05-19 00:18:58 +00:00
Andreas Gampe
54748384ea Merge "Frameworks/base: Add more systrace points" into nyc-dev 
am: b40bcfb6ad

* commit 'b40bcfb6ad3d60e5606f41c6628c133512e0538e':
  Frameworks/base: Add more systrace points

Change-Id: I1ede493eaab4a86c67a992c2eb4129f81d903d1c
 2016-05-19 00:14:14 +00:00
Christopher Tate
3f42e0a3f3 Add default lock wallpaper capability and API am: 5d99d47f39 
am: 8d71edc83d

* commit '8d71edc83de3c695f27967dd3378306654b9953c':
  Add default lock wallpaper capability and API

Change-Id: I676d2ab9526f9e2e47f79a73cbb680673ded50f0
 2016-05-19 00:13:04 +00:00
Christopher Tate
d688617d4f Add default lock wallpaper capability and API 
am: 5d99d47f39

* commit '5d99d47f39d741ebe4a1ede53affc8c6bd198b2f':
  Add default lock wallpaper capability and API

Change-Id: Idf6c51153920e3209b2c86b892c399375c48f721
 2016-05-19 00:11:53 +00:00
TreeHugger Robot
b40bcfb6ad Merge "Frameworks/base: Add more systrace points" into nyc-dev 2016-05-19 00:09:09 +00:00
Chris Tate
4b8088ea8d Merge "API feedback: rename JobInfo methods for clarity" into nyc-dev am: b100777562 
am: c5bbf34cd9

* commit 'c5bbf34cd940f8fa62662bec3a71f7160983dc06':
  API feedback: rename JobInfo methods for clarity

Change-Id: I4b97e2f581ce0c36d1385a510916b4ad3bc4e1af
 2016-05-19 00:03:45 +00:00
Christopher Tate
d8843b7f68 Merge "API feedback: rename JobInfo methods for clarity" into nyc-dev 
am: b100777562

* commit 'b1007775622f1814c87eef3ee5a325f606adb26c':
  API feedback: rename JobInfo methods for clarity

Change-Id: I2aad59e4126f2025b98051cc348e73be282aad5d
 2016-05-19 00:03:17 +00:00
Christopher Tate
8d71edc83d Add default lock wallpaper capability and API 
am: 5d99d47f39

* commit '5d99d47f39d741ebe4a1ede53affc8c6bd198b2f':
  Add default lock wallpaper capability and API

Change-Id: Ib617878c13d4a6530a12365199742fa7ffb5d590
 2016-05-19 00:02:47 +00:00
Christopher Tate
c5bbf34cd9 Merge "API feedback: rename JobInfo methods for clarity" into nyc-dev 
am: b100777562

* commit 'b1007775622f1814c87eef3ee5a325f606adb26c':
  API feedback: rename JobInfo methods for clarity

Change-Id: I4fb08a73a64233e9d016f520f08944e22ec5ccd3
 2016-05-18 23:58:03 +00:00
Christopher Tate
5d99d47f39 Add default lock wallpaper capability and API 
If present, the system property "ro.config.lock_wallpaper" provides a
filesystem path to a decodeable image file to use as the system's
out-of-the-box lock wallpaper imagery.  In the absence of this
system property, or if the indicated file is absent or unreadable,
then the new framework resource
com.android.internal.R.drawable.default_lock_wallpaper is consulted to
locate a usable asset.  This mechanism parallels the existing one for
the default system wallpaper.

By default there is no specific lock wallpaper asset; the resource is
defined to be @null in the standard config.xml file.  A product that
wants to define such a factory-default lock-only wallpaper image
will provide the asset as part of its framework resource overlay.

Bug 27828056

Change-Id: Iebf3706222370d0a0a4baf88d71a59ead07a25c7
 2016-05-18 23:57:46 +00:00
Chris Tate
b100777562 Merge "API feedback: rename JobInfo methods for clarity" into nyc-dev 2016-05-18 23:50:14 +00:00
Robin Lee
22e9213a1c Merge "Lock down networking when waiting for always-on" into nyc-dev am: d171df660e 
am: 77ab7fc8d4

* commit '77ab7fc8d4f4596b1275a7065f05380e22da3a1a':
  Lock down networking when waiting for always-on

Change-Id: I4160a61ca437d20df4342a44ed24fc6ad47962c6
 2016-05-18 23:47:52 +00:00
Robin Lee
77ab7fc8d4 Merge "Lock down networking when waiting for always-on" into nyc-dev 
am: d171df660e

* commit 'd171df660e19bdba4d188beeb8b6023874712413':
  Lock down networking when waiting for always-on

Change-Id: I7be0a85597936421750d1da0fde3d55d7d4fabc5
 2016-05-18 23:42:43 +00:00
Robin Lee
43fbfbf94c Merge "Lock down networking when waiting for always-on" into nyc-dev 
am: d171df660e

* commit 'd171df660e19bdba4d188beeb8b6023874712413':
  Lock down networking when waiting for always-on

Change-Id: I34fffb119eecef0052be673f307ef63c94fc58ee
 2016-05-18 23:42:40 +00:00
Robin Lee
d171df660e Merge "Lock down networking when waiting for always-on" into nyc-dev 2016-05-18 23:37:24 +00:00
Robin Lee
17e6183b85 Lock down networking when waiting for always-on 
Fix: 26694104
Fix: 27042309
Fix: 28335277
Change-Id: I47a4c9d2b98235195b1356af3dabf7235870e4fa
 2016-05-19 00:26:53 +01:00
Sunny Goyal
fcdbde4caa Merge "Store the appropriate layout id for the infrated view, so that it can be used for verification during reapply." into nyc-mr1-dev 
am: d2d8e9b228

* commit 'd2d8e9b22830a07d12f1542a5dc9476a3ab3d7bb':
  Store the appropriate layout id for the infrated view, so that it can be used for verification during reapply.

Change-Id: I04ca85225233f4165c3c9cd1ab56d9c772b7d7c1
 2016-05-18 23:20:43 +00:00
Sunny Goyal
d2d8e9b228 Merge "Store the appropriate layout id for the infrated view, so that it can be used for verification during reapply." into nyc-mr1-dev 2016-05-18 23:13:00 +00:00
Sunny Goyal
49e6695c5c Store the appropriate layout id for the infrated view, so that 
it can be used for verification during reapply.

Bug: 28815495
Change-Id: I8516661ef97f529851069331a6c2bb64429c7766
 2016-05-18 16:11:11 -07:00
Paul Crowley
02826bb36b Merge "Two phases to set the password for disk encryption" into nyc-dev am: 56a9395aeb 
am: 2a1076339e

* commit '2a1076339ecb7ba9b7c8829bb3c3285df29a67e3':
  Two phases to set the password for disk encryption

Change-Id: I884dae66b133d8b9312a7793d415964e13ed8105
 2016-05-18 22:54:43 +00:00
Paul Crowley
3ddb6d5fe2 Merge "Two phases to set the password for disk encryption" into nyc-dev 
am: 56a9395aeb

* commit '56a9395aeb198e0a7db5e9666cc81ba7ce5f8e0d':
  Two phases to set the password for disk encryption

Change-Id: Ieac13a4c2775e3d2bc5463f4161c6e8b151bf6c9
 2016-05-18 22:50:37 +00:00
Paul Crowley
2a1076339e Merge "Two phases to set the password for disk encryption" into nyc-dev 
am: 56a9395aeb

* commit '56a9395aeb198e0a7db5e9666cc81ba7ce5f8e0d':
  Two phases to set the password for disk encryption

Change-Id: I76b3b1351ea85d8a5e42da523f57a291b3a1b0d9
 2016-05-18 22:50:02 +00:00
Andreas Gampe
a8a58ffdee Frameworks/base: Optimize LoadedApk 
Preallocate storage lists and avoid TextUtils and its string
builder for a common code path.

Optimize list join helper to not have a check in the loop.

Bug: 28801010
Change-Id: Iafc582031f973d718252b34bcda6405a77425628
 2016-05-18 15:48:12 -07:00
Andreas Gampe
4c8e542f68 Frameworks/base: Add more systrace points 
Add more systrace points for application startup.

Bug: 28625993
Change-Id: I76dca9e842fb43f1b85981ef94582074d31528c8
 2016-05-18 15:43:45 -07:00
Paul Crowley
56a9395aeb Merge "Two phases to set the password for disk encryption" into nyc-dev 2016-05-18 22:40:09 +00:00
Robert Carr
3b0a049b11 Merge "Fixes for ending PiP animation." into nyc-dev am: bc9edc7ccb 
am: 9782de1ffd

* commit '9782de1ffd344d1a8250b8ead4a13eee16c20cde':
  Fixes for ending PiP animation.

Change-Id: I34acea654389eedd7d3b6f6e7ec2f239cccf2ae6
 2016-05-18 22:11:10 +00:00
Robert Carr
9782de1ffd Merge "Fixes for ending PiP animation." into nyc-dev 
am: bc9edc7ccb

* commit 'bc9edc7ccb4d876bfc5c706fbb64dab9a2768b52':
  Fixes for ending PiP animation.

Change-Id: If885965536859bc2433d14d4993010871c171360
 2016-05-18 22:05:30 +00:00
Robert Carr
cd1a9642e8 Merge "Fixes for ending PiP animation." into nyc-dev 
am: bc9edc7ccb

* commit 'bc9edc7ccb4d876bfc5c706fbb64dab9a2768b52':
  Fixes for ending PiP animation.

Change-Id: I58d62d0d0dd964264395b545bf4e3093a0ffaf88
 2016-05-18 22:05:28 +00:00
TreeHugger Robot
bc9edc7ccb Merge "Fixes for ending PiP animation." into nyc-dev 2016-05-18 21:57:23 +00:00
Winson Chung
ea9220988e Merge "Mark occluded home stack as invisible." into nyc-dev am: 32b54f2e42 
am: 6e2ee9e382

* commit '6e2ee9e382dd86340d5242fe04a623b9cda10f6e':
  Mark occluded home stack as invisible.

Change-Id: I1762cf46b675fe2c5151332a53139e95d676cb01
 2016-05-18 21:56:10 +00:00