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
Selim Cinek
665f53fd13 Merge "Fixed a bug where autobundling could lead to bugs" into nyc-dev am: a75bd7d4e0 
am: 942bcffe7b

* commit '942bcffe7b9139a486a03cb0359c39d66d8bb5cc':
  Fixed a bug where autobundling could lead to bugs

Change-Id: I2ac888fb3f41c6fe3a7867503b30f1fe010206ed
 2016-05-19 01:12:48 +00:00
Selim Cinek
97ea6c172d Merge "Fixed a bug where autobundling could lead to bugs" into nyc-dev am: a75bd7d4e0 
am: 8b624e5978

* commit '8b624e59787c85a5a54bd80718447e273b58abc0':
  Fixed a bug where autobundling could lead to bugs

Change-Id: I08b67312746ff5a5d359342615143597307069c7
 2016-05-19 01:12:22 +00:00
Andrew Solovay
2c5ed120c4 doc: Updates to release notes post-DP3 am: fd30a43337 
am: 788edcb7ec

* commit '788edcb7ecf03bdabfc8c82cd9949a130c7d2dcc':
  doc: Updates to release notes post-DP3

Change-Id: I656981ca1a6b16e4a429b84abfdc6efad20216cf
 2016-05-19 01:09:38 +00:00
Joe Fernandez
ef0f1fd4d5 docs: Add video to Instant Apps landing page 
b/28842359

Change-Id: Idb097501425ca0a50f547a22f54217878075376a
 2016-05-18 18:07:17 -07:00
Selim Cinek
942bcffe7b Merge "Fixed a bug where autobundling could lead to bugs" into nyc-dev 
am: a75bd7d4e0

* commit 'a75bd7d4e01985c8ad8aa57960337cc3507f374a':
  Fixed a bug where autobundling could lead to bugs

Change-Id: Ice2ec07392808c127cac7424f2e193789d712ece
 2016-05-19 01:06:36 +00:00
Selim Cinek
8b624e5978 Merge "Fixed a bug where autobundling could lead to bugs" into nyc-dev 
am: a75bd7d4e0

* commit 'a75bd7d4e01985c8ad8aa57960337cc3507f374a':
  Fixed a bug where autobundling could lead to bugs

Change-Id: I41033eaf326565f73cd2cbb2eb0d2a16be0e430f
 2016-05-19 01:06:28 +00:00
Andrew Solovay
788edcb7ec doc: Updates to release notes post-DP3 
am: fd30a43337

* commit 'fd30a43337d31ddcb6925fe275cf0d5cc7a9ed63':
  doc: Updates to release notes post-DP3

Change-Id: If45ef33e3b718649c1c717a9d14613a94f30a839
 2016-05-19 01:06:20 +00:00
TreeHugger Robot
a75bd7d4e0 Merge "Fixed a bug where autobundling could lead to bugs" into nyc-dev 2016-05-19 00:58:25 +00:00
TreeHugger Robot
6b17a56cc6 Merge "Enable debug logging." 2016-05-19 00:56:32 +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
Andrew Solovay
fd30a43337 doc: Updates to release notes post-DP3 
Fixed a mistake (duplicated known-issue) and changed the AfW section
title.

Also added a new adb-related bug in a new "Developer Tools" section.

See first comment for doc stage location.

bug: 28844418
bug: 28347842

Change-Id: I10138a66d596b8aeb5a35a9366950af9f4c7cc51
 2016-05-18 17:36:45 -07:00
Andreas Gampe
653274bd0f Add default lock wallpaper capability and API am: 5d99d47f39 am: e289467a1e 
am: eca2131bb7

* commit 'eca2131bb7ce4ef652903ee39c98f7e82ea5a965':

Change-Id: Ic5360493283b88b259b42a29e1a7e71f1f0ce088
 2016-05-19 00:30:44 +00:00
Christopher Tate
ce5b8ed097 Merge "Add default lock wallpaper capability and API am: 5d99d47f39 am: d688617d4f" into nyc-mr1-dev-plus-aosp 
am: 6ea9678cfe

* commit '6ea9678cfea8b68b54632ec7ba93b37499a4bd36':

Change-Id: I4f42b087b59a229677afeb956be4917261b1a100
 2016-05-19 00:23:59 +00:00
Andreas Gampe
90e4bf8b0f Merge "Frameworks/base: Add more systrace points" into nyc-dev am: b40bcfb6ad am: 54748384ea 
am: f466f7bbd5

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

Change-Id: If2657b0ee41ccbac74981f0500c12515858aa70f
 2016-05-19 00:23:53 +00:00
Christopher Tate
eca2131bb7 Add default lock wallpaper capability and API am: 5d99d47f39 
am: e289467a1e

* commit 'e289467a1ea65b04c7d4a425fefa881c08c04ed4':

Change-Id: Ied99fa8d271dc01fb74131f6c1deb0f0e3d0edae
 2016-05-19 00:23:24 +00:00
Garfield, Tan
ad02945b8b Convert ItemDragListenerTest to JUnit4, and add it to APCT. 
Change-Id: I45fd0c64154710e39dd8c0f43362f74eda11e3fc
(cherry picked from commit 5413e81c8e9ca94da2c792403ae8c072535d95b2)
 2016-05-19 00:21:00 +00:00
Android Build Merger (Role)
6ea9678cfe Merge "Add default lock wallpaper capability and API am: 5d99d47f39 am: d688617d4f" into nyc-mr1-dev-plus-aosp 2016-05-19 00:20:12 +00:00
Chris Tate
700b06f757 Merge "Merge "API feedback: rename JobInfo methods for clarity" into nyc-dev am: b100777562 am: d8843b7f68" into nyc-mr1-dev-plus-aosp 
am: 0187b10b63

* commit '0187b10b63e058d075dd7eda0b07f9c71d38a634':

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

* commit '3f42e0a3f3c8fb51804e9f3be40e3262ff67f2d5':
  Add default lock wallpaper capability and API

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

* commit 'd688617d4f3ecc09965f12c6cae9d1437615c7c9':

Change-Id: I3cbfeb3cf398d6d2e6ede9c2dcdc4318c2552350
 2016-05-19 00:19:49 +00: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
Android Build Merger (Role)
0187b10b63 Merge "Merge "API feedback: rename JobInfo methods for clarity" into nyc-dev am: b100777562 am: d8843b7f68" into nyc-mr1-dev-plus-aosp 2016-05-19 00:14:46 +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
Selim Cinek
c2c0b043cf Fixed a bug where the chronometer was invisible 
We were requiring the time to show in order to show the chronomer
which didn't make any sense.

Change-Id: Ia6d00d0932d272a6c5e20e8b41e3acfb53b7987a
Fixes: 28848113
 2016-05-18 17:13:46 -07:00
Chris Tate
26ff7f6fdd Merge "API feedback: rename JobInfo methods for clarity" into nyc-dev am: b100777562 
am: d8843b7f68

* commit 'd8843b7f68c043c9d053d75100b12d4fd5c78f8e':

Change-Id: I461f4e73d8eb1eab389070e5736a23af43a59314
 2016-05-19 00:13:31 +00:00
Christopher Tate
c79333d873 Merge "API feedback: rename JobInfo methods for clarity" into nyc-dev am: b100777562 am: c5bbf34cd9 
am: 4b8088ea8d

* commit '4b8088ea8d2efece9c588b0ddee24ad06d53a28b':
  API feedback: rename JobInfo methods for clarity

Change-Id: I2ee283a476e1bc706509016c80821e1f9bc1020b
 2016-05-19 00:13:17 +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
Selim Cinek
a2a0171e7c Fixed a bug where the chronometer wasn't updating the time 
When the countdown was set to true and the chronometer was set to
count down it wasn't updating the time, which is now fixed.

Change-Id: I4887d9eb09193c5636070edee9ba1bd13b9a23b5
Fixes: 28829131
 2016-05-18 16:59:07 -07: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
Etan Cohen
71ad6aabef Merge "resolve merge conflicts of fb8021c to master" 2016-05-18 23:55:25 +00:00
Etan Cohen
fc31a8e4f1 resolve merge conflicts of fb8021c to master 
Change-Id: Ic2869ca4bf8acfa2080810145f887bf643f1d52a
 2016-05-18 16:54:29 -07:00
Robin Lee
166b0e8bd7 Merge "Merge "Lock down networking when waiting for always-on" into nyc-dev am: d171df660e am: 43fbfbf94c" into nyc-mr1-dev-plus-aosp 
am: 44bc81e62d

* commit '44bc81e62d47698c28eaf59d27334dfaf903b2cf':

Change-Id: I09b4ac15a63b8e8972e19ffeccfa1a6eccfdded2
 2016-05-18 23:53:30 +00:00
Robin Lee
24f7b92a3c Merge "Lock down networking when waiting for always-on" into nyc-dev am: d171df660e am: 77ab7fc8d4 
am: 22e9213a1c

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

Change-Id: I50583a9738ac51378e5f5dcbbaa396f1aa30f97c
 2016-05-18 23:53:25 +00:00
Sanket Padawe
06e1ae1a51 Add new TelephonyManager api to query Telephony metrics. 
Bug: 28717269
Change-Id: I6f5e88509feda879162049955776cb61dda8c840
 2016-05-18 16:51:49 -07:00
Chris Tate
b100777562 Merge "API feedback: rename JobInfo methods for clarity" into nyc-dev 2016-05-18 23:50:14 +00:00
Ben Lin
93fafd67a6 Register change Uri and notify changes in bugreportServices. 
Bug: 28767380
Change-Id: Ia4d1f5a2e44881d300f2869c628d4990406caf40
(cherry picked from commit 6c9ff513c6d7d3de7ab8920d88111c2b1dc1bb1f)
 2016-05-18 23:49:11 +00:00
Android Build Merger (Role)
44bc81e62d Merge "Merge "Lock down networking when waiting for always-on" into nyc-dev am: d171df660e am: 43fbfbf94c" into nyc-mr1-dev-plus-aosp 2016-05-18 23:48:27 +00:00
Robin Lee
a4049e4a5a Merge "Lock down networking when waiting for always-on" into nyc-dev am: d171df660e 
am: 43fbfbf94c

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

Change-Id: I883c68faafde99eb00c37962a517dceb4a4f9d32
 2016-05-18 23:47:59 +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
Garfield, Tan
ab7b37214f Enable debug logging. 
Change-Id: Ie891efdda96a97286fd22348903e93b36a2a6e83
(cherry picked from commit fbb4e79a06ca02f2aa02724e3e9bd4134a8e515d)
 2016-05-18 23:47:37 +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
Abhijith Shastry
95fd74c1f7 Update BlockedNumberContract javadocs. 
Include @return for all public methods.

BUG: 28842525
Change-Id: Ie0fddee1d889f188a77c45d8bdbf78ea9fe323ba
 2016-05-18 16:39:56 -07:00