OSDN Git Service

android-x86/frameworks-base.git
7 years agoDO NOT MERGE: Add TouchLatency test am: 91e2e7f460 am: 579e3667e3
John Reck [Tue, 6 Dec 2016 20:27:46 +0000 (20:27 +0000)]
DO NOT MERGE: Add TouchLatency test am: 91e2e7f460 am: 579e3667e3
am: 24b0b5ca68  -s ours

Change-Id: I6a489a035d2242e42504941b82718611cf87e022

7 years agoDO NOT MERGE: Add TouchLatency test am: 91e2e7f460
John Reck [Tue, 6 Dec 2016 20:20:46 +0000 (20:20 +0000)]
DO NOT MERGE: Add TouchLatency test am: 91e2e7f460
am: 579e3667e3

Change-Id: Ie27b93371a22360e6cdb9dffc2e78c14fa28333f

7 years agoDO NOT MERGE: Add TouchLatency test
John Reck [Tue, 6 Dec 2016 20:13:49 +0000 (20:13 +0000)]
DO NOT MERGE: Add TouchLatency test
am: 91e2e7f460

Change-Id: I1eeed0e4aea8dbe2d963b38cfe9d79449e1a17d2

7 years agoMerge "Add READ_PHONE_NUMBER to the list of dangerous permissions."
TreeHugger Robot [Tue, 6 Dec 2016 20:12:05 +0000 (20:12 +0000)]
Merge "Add READ_PHONE_NUMBER to the list of dangerous permissions."

7 years agoMerge "Add Settings.Global.NETWORK_RECOMMENDATIONS_ENABLED flag." am: 70ae1bf4db...
Stephen Chen [Tue, 6 Dec 2016 19:41:55 +0000 (19:41 +0000)]
Merge "Add Settings.Global.NETWORK_RECOMMENDATIONS_ENABLED flag." am: 70ae1bf4db am: 45fdf32038 am: e70ef235fb
am: 70889ff69f

Change-Id: If076123dc3874615b058bbddfd3c4810f54b303d

7 years agoMerge "Add Settings.Global.NETWORK_RECOMMENDATIONS_ENABLED flag." am: 70ae1bf4db...
Stephen Chen [Tue, 6 Dec 2016 19:34:46 +0000 (19:34 +0000)]
Merge "Add Settings.Global.NETWORK_RECOMMENDATIONS_ENABLED flag." am: 70ae1bf4db am: 45fdf32038
am: e70ef235fb

Change-Id: I46186245e038597018f66e44459d724456e8f993

7 years agoMerge "Revert "Revert "WindowList be gone!"""
TreeHugger Robot [Tue, 6 Dec 2016 19:27:49 +0000 (19:27 +0000)]
Merge "Revert "Revert "WindowList be gone!"""

7 years agoMerge "Add Settings.Global.NETWORK_RECOMMENDATIONS_ENABLED flag." am: 70ae1bf4db
Stephen Chen [Tue, 6 Dec 2016 19:27:45 +0000 (19:27 +0000)]
Merge "Add Settings.Global.NETWORK_RECOMMENDATIONS_ENABLED flag." am: 70ae1bf4db
am: 45fdf32038

Change-Id: I141248962fc0ce710b6860f3f67ca156ecdab46e

7 years agoMerge "Init PersistentDatablockService on the worker thread"
Fyodor Kupolov [Tue, 6 Dec 2016 19:22:13 +0000 (19:22 +0000)]
Merge "Init PersistentDatablockService on the worker thread"

7 years agoMerge "Add Settings.Global.NETWORK_RECOMMENDATIONS_ENABLED flag."
Stephen Chen [Tue, 6 Dec 2016 19:20:24 +0000 (19:20 +0000)]
Merge "Add Settings.Global.NETWORK_RECOMMENDATIONS_ENABLED flag."
am: 70ae1bf4db

Change-Id: If3d13f94a131188ddbebc7a35c82ea357b37e022

7 years agoMerge "Add Settings.Global.NETWORK_RECOMMENDATIONS_ENABLED flag."
Treehugger Robot [Tue, 6 Dec 2016 19:11:28 +0000 (19:11 +0000)]
Merge "Add Settings.Global.NETWORK_RECOMMENDATIONS_ENABLED flag."

7 years agoMerge "Merge "Centre clock text on visible characters instead of : character" into...
Damien Bargiacchi [Tue, 6 Dec 2016 18:52:23 +0000 (18:52 +0000)]
Merge "Merge "Centre clock text on visible characters instead of : character" into cw-f-dev am: ad7c7acad6 am: 43b08e2fb3" into nyc-mr2-dev-plus-aosp
am: 416427e820

Change-Id: I790669ff7d7345360959528f17cf5b44a2d302c7

7 years agoMerge "Centre clock text on visible characters instead of : character" into cw-f...
Damien Bargiacchi [Tue, 6 Dec 2016 18:52:14 +0000 (18:52 +0000)]
Merge "Centre clock text on visible characters instead of : character" into cw-f-dev am: ad7c7acad6 am: 43b08e2fb3
am: 81de5ef429

Change-Id: I90e188b2b4a702df9c8f5e5873f75b3cfd20cc18

7 years agoMerge "Merge "Centre clock text on visible characters instead of : character" into...
Damien Bargiacchi [Tue, 6 Dec 2016 18:50:39 +0000 (18:50 +0000)]
Merge "Merge "Centre clock text on visible characters instead of : character" into cw-f-dev am: ad7c7acad6 am: 4ce3dee6e6" into nyc-mr2-dev-plus-aosp
am: f72b595f68

Change-Id: I0a31e2a107a0d88944ec8487212da33ec4805f34

7 years agoMerge "Centre clock text on visible characters instead of : character" into cw-f...
Damien Bargiacchi [Tue, 6 Dec 2016 18:50:30 +0000 (18:50 +0000)]
Merge "Centre clock text on visible characters instead of : character" into cw-f-dev am: ad7c7acad6 am: 4ce3dee6e6
am: 72ae53f0d3

Change-Id: I7a336c5b6bd44307b812105cd18e0555e02408a8

7 years agoMerge "Centre clock text on visible characters instead of : character am: 45a7644004...
Damien Bargiacchi [Tue, 6 Dec 2016 18:49:00 +0000 (18:49 +0000)]
Merge "Centre clock text on visible characters instead of : character am: 45a7644004 am: 76a3de316c" into nyc-mr2-dev-plus-aosp
am: 45a6dfa88a

Change-Id: I115649ab4bc8aafdc6d68c089b3eed619f16f97f

7 years agoCentre clock text on visible characters instead of : character am: 45a7644004 am...
Damien Bargiacchi [Tue, 6 Dec 2016 18:48:51 +0000 (18:48 +0000)]
Centre clock text on visible characters instead of : character am: 45a7644004 am: 76a3de316c
am: 7237200947

Change-Id: I2ff3590bdecc0331dc05f31eaac4bf7f226df8a8

7 years agoCentre clock text on visible characters instead of : character am: 45a7644004 am...
Damien Bargiacchi [Tue, 6 Dec 2016 18:47:46 +0000 (18:47 +0000)]
Centre clock text on visible characters instead of : character am: 45a7644004 am: 04f17be3e6
am: e2ca6b465e

Change-Id: If3edabead7835e9949f1d1601cbe7cb59c0bbc4c

7 years agoMerge "Merge "Centre clock text on visible characters instead of : character" into...
Android Build Merger (Role) [Tue, 6 Dec 2016 18:42:25 +0000 (18:42 +0000)]
Merge "Merge "Centre clock text on visible characters instead of : character" into cw-f-dev am: ad7c7acad6 am: 43b08e2fb3" into nyc-mr2-dev-plus-aosp

7 years agoMerge "Merge "Centre clock text on visible characters instead of : character" into...
Android Build Merger (Role) [Tue, 6 Dec 2016 18:42:13 +0000 (18:42 +0000)]
Merge "Merge "Centre clock text on visible characters instead of : character" into cw-f-dev am: ad7c7acad6 am: 4ce3dee6e6" into nyc-mr2-dev-plus-aosp

7 years agoMerge "Centre clock text on visible characters instead of : character" into cw-f...
Damien Bargiacchi [Tue, 6 Dec 2016 18:41:47 +0000 (18:41 +0000)]
Merge "Centre clock text on visible characters instead of : character" into cw-f-dev am: ad7c7acad6
am: 43b08e2fb3

Change-Id: I62153920f518f43da399d30cc326f968035d9f34

7 years agoMerge "Centre clock text on visible characters instead of : character" into cw-f...
Damien Bargiacchi [Tue, 6 Dec 2016 18:41:38 +0000 (18:41 +0000)]
Merge "Centre clock text on visible characters instead of : character" into cw-f-dev am: ad7c7acad6
am: 4ce3dee6e6

Change-Id: Id92ec78e061736e4b269226cecc8b73e5b19be39

7 years agoMerge "Centre clock text on visible characters instead of : character am: 45a7644004...
Android Build Merger (Role) [Tue, 6 Dec 2016 18:41:25 +0000 (18:41 +0000)]
Merge "Centre clock text on visible characters instead of : character am: 45a7644004 am: 76a3de316c" into nyc-mr2-dev-plus-aosp

7 years agoCentre clock text on visible characters instead of : character am: 45a7644004
Damien Bargiacchi [Tue, 6 Dec 2016 18:40:41 +0000 (18:40 +0000)]
Centre clock text on visible characters instead of : character am: 45a7644004
am: 76a3de316c

Change-Id: I53dd7121aea7dedf6d96fb6104c37e67784a263a

7 years agoCentre clock text on visible characters instead of : character am: 45a7644004
Damien Bargiacchi [Tue, 6 Dec 2016 18:40:39 +0000 (18:40 +0000)]
Centre clock text on visible characters instead of : character am: 45a7644004
am: 04f17be3e6

Change-Id: Ia6af0064f606062a646aa3e251b56631992aa86b

7 years agoMerge "Centre clock text on visible characters instead of : character" into cw-f-dev
Damien Bargiacchi [Tue, 6 Dec 2016 18:32:55 +0000 (18:32 +0000)]
Merge "Centre clock text on visible characters instead of : character" into cw-f-dev
am: ad7c7acad6

Change-Id: Id9f91317d128f97ff849f8644f452a9bf7dd9fd2

7 years agoCentre clock text on visible characters instead of : character
Damien Bargiacchi [Tue, 6 Dec 2016 18:32:48 +0000 (18:32 +0000)]
Centre clock text on visible characters instead of : character
am: 45a7644004

Change-Id: Ibb152f2217297ab0b0aa1ec622e59ae8ae815d59

7 years agoMerge "Centre clock text on visible characters instead of : character" into cw-f-dev
Damien Bargiacchi [Tue, 6 Dec 2016 18:32:45 +0000 (18:32 +0000)]
Merge "Centre clock text on visible characters instead of : character" into cw-f-dev
am: ad7c7acad6

Change-Id: Ibc7e4c27b65f87c3b9396b7ae668ed9f55af6f79

7 years agoCentre clock text on visible characters instead of : character
Damien Bargiacchi [Tue, 6 Dec 2016 18:32:42 +0000 (18:32 +0000)]
Centre clock text on visible characters instead of : character
am: 45a7644004

Change-Id: I8cf50fd314442a1e42a4cdd4c3f058d680c531dd

7 years agoAdd READ_PHONE_NUMBER to the list of dangerous permissions.
Chad Brubaker [Tue, 6 Dec 2016 18:31:43 +0000 (10:31 -0800)]
Add READ_PHONE_NUMBER to the list of dangerous permissions.

Test: system_server no longer crahes when granting READ_PHONE_NUMBER
Change-Id: I45f66df9b9723a54ca7d1d29eac606136134d80a

7 years agoMerge "Centre clock text on visible characters instead of : character" into cw-f-dev
TreeHugger Robot [Tue, 6 Dec 2016 18:25:27 +0000 (18:25 +0000)]
Merge "Centre clock text on visible characters instead of : character" into cw-f-dev

7 years agoMerge "Add single use App specific incoming SMSes"
Chad Brubaker [Tue, 6 Dec 2016 18:06:23 +0000 (18:06 +0000)]
Merge "Add single use App specific incoming SMSes"

7 years agoRevert "Revert "WindowList be gone!""
Wale Ogunwale [Fri, 2 Dec 2016 16:47:15 +0000 (16:47 +0000)]
Revert "Revert "WindowList be gone!""

This reverts commit ffa5a9de0c127cb77ddec625fea101ddddb7ad32.

Bug: 33098800
Bug: 33098294
Test: Existing tests pass.
Change-Id: I5803a010c5a224dd1cf452a4a7beb3a4c0a043f4

7 years agoresolve merge conflicts of 9600df0 to stage-aosp-master am: f120cf3d88 am: 99db203f29
Jason Monk [Tue, 6 Dec 2016 16:55:15 +0000 (16:55 +0000)]
resolve merge conflicts of 9600df0 to stage-aosp-master am: f120cf3d88 am: 99db203f29
am: 14e55354c2

Change-Id: Icf3490bfe111607ae1711ceef8ade55ed0b35ec9

7 years agoresolve merge conflicts of 9600df0 to stage-aosp-master am: f120cf3d88
Jason Monk [Tue, 6 Dec 2016 16:49:54 +0000 (16:49 +0000)]
resolve merge conflicts of 9600df0 to stage-aosp-master am: f120cf3d88
am: 99db203f29

Change-Id: I908b554d4ec2adcec6c6d95c768153bcab569cbf

7 years agoresolve merge conflicts of 9600df0 to stage-aosp-master
Jason Monk [Tue, 6 Dec 2016 16:43:38 +0000 (16:43 +0000)]
resolve merge conflicts of 9600df0 to stage-aosp-master
am: f120cf3d88

Change-Id: Id2c5d4905fed661466929ed93e08e7b079c8c51d

7 years agoresolve merge conflicts of 9600df0 to stage-aosp-master
Jason Monk [Tue, 6 Dec 2016 16:34:12 +0000 (11:34 -0500)]
resolve merge conflicts of 9600df0 to stage-aosp-master

Change-Id: I139c64bb2440d64312d7e763e53bdb13dcb9f1aa

7 years agoMerge "Check for nullptr when casting IBinder to IBase." am: 5014028691 am: 1abe6def6...
Yifan Hong [Tue, 6 Dec 2016 15:59:06 +0000 (15:59 +0000)]
Merge "Check for nullptr when casting IBinder to IBase." am: 5014028691 am: 1abe6def68 am: fee17700af
am: be1ea967f0

Change-Id: I9966f11aed18d4247e24b3ed0a1716096efe01e2

7 years agoMerge "Check for nullptr when casting IBinder to IBase." am: 5014028691 am: 1abe6def68
Yifan Hong [Tue, 6 Dec 2016 15:53:55 +0000 (15:53 +0000)]
Merge "Check for nullptr when casting IBinder to IBase." am: 5014028691 am: 1abe6def68
am: fee17700af

Change-Id: I5b478eb2c8a6919ddaffa992b89ab1e01d63bb9e

7 years agoMerge "[DO NOT MERGE] Allow multiple toasts for the focused app" into nyc-mr2-dev...
Svet Ganov [Tue, 6 Dec 2016 15:47:27 +0000 (15:47 +0000)]
Merge "[DO NOT MERGE] Allow multiple toasts for the focused app" into nyc-mr2-dev am: a6dbd4934c
am: e5276464f7  -s ours

Change-Id: I131324741da2c4c3ed9a3160231bb482d2b0882e

7 years ago[DO NOT MERGE] Allow multiple toasts for the focused app am: 296a60acc3
Svet Ganov [Tue, 6 Dec 2016 15:46:35 +0000 (15:46 +0000)]
[DO NOT MERGE] Allow multiple toasts for the focused app am: 296a60acc3
am: bcc880d6f6  -s ours

Change-Id: I0c0cc17cfa1f53b99fb9d002d695015efb3df7f7

7 years agoMerge "Check for nullptr when casting IBinder to IBase." am: 5014028691
Yifan Hong [Tue, 6 Dec 2016 15:45:33 +0000 (15:45 +0000)]
Merge "Check for nullptr when casting IBinder to IBase." am: 5014028691
am: 1abe6def68

Change-Id: I532e548c9558dada977ca1926ef4b7e39215924f

7 years agoMerge "Import translations. DO NOT MERGE"
TreeHugger Robot [Tue, 6 Dec 2016 15:41:36 +0000 (15:41 +0000)]
Merge "Import translations. DO NOT MERGE"

7 years agoMerge "[DO NOT MERGE] Allow multiple toasts for the focused app" into nyc-mr2-dev
Svet Ganov [Tue, 6 Dec 2016 15:39:07 +0000 (15:39 +0000)]
Merge "[DO NOT MERGE] Allow multiple toasts for the focused app" into nyc-mr2-dev
am: a6dbd4934c

Change-Id: If21ce32f0c7e6652a4185c5f10c2157e078f8217

7 years agoMerge "Check for nullptr when casting IBinder to IBase."
Yifan Hong [Tue, 6 Dec 2016 15:39:02 +0000 (15:39 +0000)]
Merge "Check for nullptr when casting IBinder to IBase."
am: 5014028691

Change-Id: I4a3c320351a9afa305a40e3912cc2e968494497c

7 years ago[DO NOT MERGE] Allow multiple toasts for the focused app
Svet Ganov [Tue, 6 Dec 2016 15:39:01 +0000 (15:39 +0000)]
[DO NOT MERGE] Allow multiple toasts for the focused app
am: 296a60acc3

Change-Id: If076e3af0033447eb074ba45721205974cb763a4

7 years agoMerge "Import translations. DO NOT MERGE"
TreeHugger Robot [Tue, 6 Dec 2016 15:38:57 +0000 (15:38 +0000)]
Merge "Import translations. DO NOT MERGE"

7 years agoMerge "Import translations. DO NOT MERGE"
TreeHugger Robot [Tue, 6 Dec 2016 15:38:35 +0000 (15:38 +0000)]
Merge "Import translations. DO NOT MERGE"

7 years agoMerge "Import translations. DO NOT MERGE"
TreeHugger Robot [Tue, 6 Dec 2016 15:38:04 +0000 (15:38 +0000)]
Merge "Import translations. DO NOT MERGE"

7 years agoMerge "PackageParser: Add support for caching parse results on the file system."
Narayan Kamath [Tue, 6 Dec 2016 15:24:02 +0000 (15:24 +0000)]
Merge "PackageParser: Add support for caching parse results on the file system."

7 years agoMerge "[DO NOT MERGE] Allow multiple toasts for the focused app" into nyc-mr2-dev
TreeHugger Robot [Tue, 6 Dec 2016 15:19:52 +0000 (15:19 +0000)]
Merge "[DO NOT MERGE] Allow multiple toasts for the focused app" into nyc-mr2-dev

7 years agoMerge "Fix Hotspot tile is shown on Guest user"
Jason Monk [Tue, 6 Dec 2016 15:11:18 +0000 (15:11 +0000)]
Merge "Fix Hotspot tile is shown on Guest user"

7 years agoMerge "Link from Quick Settings to Enterprise Privacy page"
Bartosz Fabianowski [Tue, 6 Dec 2016 15:09:28 +0000 (15:09 +0000)]
Merge "Link from Quick Settings to Enterprise Privacy page"

7 years agoMerge "Check for nullptr when casting IBinder to IBase."
Treehugger Robot [Tue, 6 Dec 2016 15:08:39 +0000 (15:08 +0000)]
Merge "Check for nullptr when casting IBinder to IBase."

7 years agoMerge "Fix bug in GnssLocationProvider."
TreeHugger Robot [Tue, 6 Dec 2016 14:51:49 +0000 (14:51 +0000)]
Merge "Fix bug in GnssLocationProvider."

7 years agoMerge "Add libziparchive explicitly."
TreeHugger Robot [Tue, 6 Dec 2016 14:08:41 +0000 (14:08 +0000)]
Merge "Add libziparchive explicitly."

7 years agoMerge "AutoSize TextView (part 3) - define who supports autosize"
Andrei Stingaceanu [Tue, 6 Dec 2016 13:20:56 +0000 (13:20 +0000)]
Merge "AutoSize TextView (part 3) - define who supports autosize"

7 years agoAutoSize TextView (part 3) - define who supports autosize
Andrei Stingaceanu [Mon, 28 Nov 2016 15:51:13 +0000 (15:51 +0000)]
AutoSize TextView (part 3) - define who supports autosize

Introduces a new protected hidden method that
specifies if the TextView (or descendant) widget
supports the autosize feature. All direct children of
TextView (besides EditText) support it.

Bug: 33098425
Bug: 32221168
Test: attached in the topic

Change-Id: I6f0092b4c9948afb427fe597b0515a39b1f258f6

7 years agoMerge changes from topic 'netd-benchmark-and-logging-nyc-mr2-dev' into nyc-mr2-dev...
Michal Karpinski [Tue, 6 Dec 2016 11:53:53 +0000 (11:53 +0000)]
Merge changes from topic 'netd-benchmark-and-logging-nyc-mr2-dev' into nyc-mr2-dev am: b97196b1de
am: 41313f60aa

Change-Id: I3741cea61e253aaa15511be1be804469e761f81d

7 years agoDO NOT MERGE Add connect event reporting am: c429e71cfe
Michal Karpinski [Tue, 6 Dec 2016 11:52:26 +0000 (11:52 +0000)]
DO NOT MERGE Add connect event reporting am: c429e71cfe
am: 37012db6d0  -s ours

Change-Id: Ia41d506de553869203e4e0c45530f8c62364f2f8

7 years agoDO NOT MERGE Extending DNS event reporting am: 70444d3ad5
Michal Karpinski [Tue, 6 Dec 2016 11:51:24 +0000 (11:51 +0000)]
DO NOT MERGE Extending DNS event reporting am: 70444d3ad5
am: bea60201f3  -s ours

Change-Id: Icd67ff044613a33d938f6c21b8a19e95c06c05aa

7 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 6 Dec 2016 11:44:40 +0000 (03:44 -0800)]
Import translations. DO NOT MERGE

Change-Id: I2e4b98dd89aea3f467b999027dd0b3f330fdcd18
Auto-generated-cl: translation import

7 years agoMerge changes from topic 'netd-benchmark-and-logging-nyc-mr2-dev' into nyc-mr2-dev
Michal Karpinski [Tue, 6 Dec 2016 11:42:11 +0000 (11:42 +0000)]
Merge changes from topic 'netd-benchmark-and-logging-nyc-mr2-dev' into nyc-mr2-dev
am: b97196b1de

Change-Id: Iadfe22122e0d449991c5f0e29f2882dafb6de64f

7 years agoDO NOT MERGE Add connect event reporting
Michal Karpinski [Tue, 6 Dec 2016 11:41:22 +0000 (11:41 +0000)]
DO NOT MERGE Add connect event reporting
am: c429e71cfe

Change-Id: I0b81691ceb4d72f448a26e9ac1233a3bc89cc14e

7 years agoDO NOT MERGE Extending DNS event reporting
Michal Karpinski [Tue, 6 Dec 2016 11:40:23 +0000 (11:40 +0000)]
DO NOT MERGE Extending DNS event reporting
am: 70444d3ad5

Change-Id: Iaccaa3697f14ef111985c87ecbad3b9af81a0760

7 years agoPackageParser: Add support for caching parse results on the file system.
Narayan Kamath [Thu, 1 Dec 2016 13:32:59 +0000 (13:32 +0000)]
PackageParser: Add support for caching parse results on the file system.

The exact scheme for serializing parse results is left undefined, and
will be implemented in a follow-up change.

Also adds a unit test for this functionality.

Test: PackageParserTest
Bug: 30792387

Change-Id: I5be6a3f97b5688d0a1aa9e024e946d590ad92c13

7 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 6 Dec 2016 11:09:21 +0000 (03:09 -0800)]
Import translations. DO NOT MERGE

Change-Id: I336be133ac6cfae27371dabc43273ffdf34073bf
Auto-generated-cl: translation import

7 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 6 Dec 2016 10:44:10 +0000 (02:44 -0800)]
Import translations. DO NOT MERGE

Change-Id: Ief52b6f1c9f2cd252342de908f3c323103fa7090
Auto-generated-cl: translation import

7 years agoMerge changes from topic 'netd-benchmark-and-logging-nyc-mr2-dev' into nyc-mr2-dev
Michal Karpinski [Tue, 6 Dec 2016 10:16:32 +0000 (10:16 +0000)]
Merge changes from topic 'netd-benchmark-and-logging-nyc-mr2-dev' into nyc-mr2-dev

* changes:
  DO NOT MERGE Add connect event reporting
  DO NOT MERGE Extending DNS event reporting

7 years agoMerge "Unhiding network logging API"
Michal Karpinski [Tue, 6 Dec 2016 09:54:10 +0000 (09:54 +0000)]
Merge "Unhiding network logging API"

7 years agoMerge "Return error code from isProvisioningAllowed"
Mahaver Chopra [Tue, 6 Dec 2016 09:45:01 +0000 (09:45 +0000)]
Merge "Return error code from isProvisioningAllowed"

7 years agoLink from Quick Settings to Enterprise Privacy page
Bartosz Fabianowski [Tue, 6 Dec 2016 00:20:29 +0000 (01:20 +0100)]
Link from Quick Settings to Enterprise Privacy page

This CL updates the information shown in Quick Settings when a device
is managed by a Device Owner and adds a "learn more" link that takes
the user to the Enterprise Privacy page in Settings.

Bug: 32692748
Bug: 25779452
Test: runtest --path frameworks/base/packages/SystemUI/tests &
      runtest --path frameworks/base/core/tests/coretests

Change-Id: I8cbb6f2bb5c6da29ae581b6dcf7a01b1a4f2af2b

7 years agoMerge "AAPT2: Allow <meta-data> in <manifest>"
TreeHugger Robot [Tue, 6 Dec 2016 06:54:26 +0000 (06:54 +0000)]
Merge "AAPT2: Allow <meta-data> in <manifest>"

7 years agoAAPT2: Allow <meta-data> in <manifest>
Adam Lesinski [Tue, 6 Dec 2016 03:48:20 +0000 (19:48 -0800)]
AAPT2: Allow <meta-data> in <manifest>

Bug:32171613
Test: libaapt2_tests
Change-Id: I30fdd9475ff7dff6ceb0ff46a4a00991b72db68b

7 years agoMerge "Prevent orphaning of windows when token is removed"
TreeHugger Robot [Tue, 6 Dec 2016 04:52:32 +0000 (04:52 +0000)]
Merge "Prevent orphaning of windows when token is removed"

7 years agoMerge "Make tests use APKs instead of exploded APKs"
TreeHugger Robot [Tue, 6 Dec 2016 04:33:43 +0000 (04:33 +0000)]
Merge "Make tests use APKs instead of exploded APKs"

7 years agoFix bug in GnssLocationProvider.
Hridya Valsaraju [Tue, 6 Dec 2016 04:23:21 +0000 (20:23 -0800)]
Fix bug in GnssLocationProvider.

Perform nullptr checking correctly before calling setCallback()
on gnssXtraIface.

Bug: 33334137
Test: Checked no crash happens when GNSS HAL returns a null
GnssXtraInfc.

Change-Id: I763d96443a0a6c0f036ecfc86ac442b297560efa

7 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 6 Dec 2016 04:29:51 +0000 (20:29 -0800)]
Import translations. DO NOT MERGE

Change-Id: I7d9c8c76cfa1c08c80bc7ee496b5de5a491e2e47
Auto-generated-cl: translation import

7 years agoMake tests use APKs instead of exploded APKs
Adam Lesinski [Fri, 11 Nov 2016 00:43:59 +0000 (16:43 -0800)]
Make tests use APKs instead of exploded APKs

Tests would expect parts of the APK to be unzipped and
maintained. Instead, we now decompress the required files
from the test APKs on test setup. This simplifies
test maintenance substantially.

Test: make libandroidfw_tests && libandroidfw_tests --testdata=frameworks/base/libs/androidfw/tests/data
Change-Id: I3d2100af22df913e02401dedcf9842cdb32b2a3b

7 years agoMerge changes from topic 'am-0afb48b1e7264a0a939ebf26aaf8e5f0' into nyc-mr2-dev-plus...
Ned Burns [Tue, 6 Dec 2016 02:59:22 +0000 (02:59 +0000)]
Merge changes from topic 'am-0afb48b1e7264a0a939ebf26aaf8e5f0' into nyc-mr2-dev-plus-aosp
am: f0893b68ad

Change-Id: I0ef786be68587613afeac94a4b59ee23ce66d2bc

7 years agoMerge "Modify SwipeDismissLayout to perform its own exit animation" into cw-f-dev...
Ned Burns [Tue, 6 Dec 2016 02:53:44 +0000 (02:53 +0000)]
Merge "Modify SwipeDismissLayout to perform its own exit animation" into cw-f-dev am: 3601d3c239 am: ca8412c316
am: 648a8b1c05

Change-Id: Ic6cd158edec575d52ac2dc34dc874b102d94ec1a

7 years agoModify SwipeDismissLayout to perform its own exit animation am: 7d6cb913de am: 081fd25237
Ned Burns [Tue, 6 Dec 2016 02:52:36 +0000 (02:52 +0000)]
Modify SwipeDismissLayout to perform its own exit animation am: 7d6cb913de am: 081fd25237
am: 94c2bf7bd9

Change-Id: Ib09e3bb0b581598adfb2a336fd6aa9804434e977

7 years agoMerge "Modify SwipeDismissLayout to perform its own exit animation" into cw-f-dev...
Ned Burns [Tue, 6 Dec 2016 02:49:24 +0000 (02:49 +0000)]
Merge "Modify SwipeDismissLayout to perform its own exit animation" into cw-f-dev am: 3601d3c239 am: f59d4e0a82
am: 530e236ad6

Change-Id: If15a0b77b72300f58eb7bb0c7fe6f63c82e8c1ba

7 years agoModify SwipeDismissLayout to perform its own exit animation am: 7d6cb913de am: f9566827f2
Ned Burns [Tue, 6 Dec 2016 02:48:01 +0000 (02:48 +0000)]
Modify SwipeDismissLayout to perform its own exit animation am: 7d6cb913de am: f9566827f2
am: 768f62aac1

Change-Id: Ibe1a8b9a7cf71b715ae7d4e0157b5cdf1d52e81d

7 years agoMerge changes from topic 'am-0afb48b1e7264a0a939ebf26aaf8e5f0' into nyc-mr2-dev-plus...
Android Build Merger (Role) [Tue, 6 Dec 2016 02:41:56 +0000 (02:41 +0000)]
Merge changes from topic 'am-0afb48b1e7264a0a939ebf26aaf8e5f0' into nyc-mr2-dev-plus-aosp

* changes:
  Merge "Modify SwipeDismissLayout to perform its own exit animation" into cw-f-dev am: 3601d3c239 am: ca8412c316
  Modify SwipeDismissLayout to perform its own exit animation am: 7d6cb913de am: 081fd25237

7 years agoMerge "Modify SwipeDismissLayout to perform its own exit animation" into cw-f-dev...
Ned Burns [Tue, 6 Dec 2016 02:40:23 +0000 (02:40 +0000)]
Merge "Modify SwipeDismissLayout to perform its own exit animation" into cw-f-dev am: 3601d3c239
am: ca8412c316

Change-Id: I7b1eb7a617a5a0820cb4431daedbb9abf5b7777b

7 years agoMerge "Modify SwipeDismissLayout to perform its own exit animation" into cw-f-dev...
Ned Burns [Tue, 6 Dec 2016 02:39:53 +0000 (02:39 +0000)]
Merge "Modify SwipeDismissLayout to perform its own exit animation" into cw-f-dev am: 3601d3c239
am: f59d4e0a82

Change-Id: I252049cd012a3ea0b07ea85468d57c193178264b

7 years agoModify SwipeDismissLayout to perform its own exit animation am: 7d6cb913de
Ned Burns [Tue, 6 Dec 2016 02:39:03 +0000 (02:39 +0000)]
Modify SwipeDismissLayout to perform its own exit animation am: 7d6cb913de
am: 081fd25237

Change-Id: Id468ea0b13767263eb005bdefac99806fb2211dc

7 years agoModify SwipeDismissLayout to perform its own exit animation am: 7d6cb913de
Ned Burns [Tue, 6 Dec 2016 02:38:47 +0000 (02:38 +0000)]
Modify SwipeDismissLayout to perform its own exit animation am: 7d6cb913de
am: f9566827f2

Change-Id: I157e10afa6b8c0414c2af25d98bf5913928925f2

7 years agoMerge "Merge "Revert "Change activity dismiss animation to move left to right.""...
Michael Kwan [Tue, 6 Dec 2016 02:37:59 +0000 (02:37 +0000)]
Merge "Merge "Revert "Change activity dismiss animation to move left to right."" into cw-f-dev am: 7f2554cfb7 am: e384a782e0" into nyc-mr2-dev-plus-aosp
am: 56739549fe

Change-Id: I1cbf407213dce91893704cce3abb04a222a16809

7 years agoMerge "Revert "Change activity dismiss animation to move left to right."" into cw...
Michael Kwan [Tue, 6 Dec 2016 02:37:51 +0000 (02:37 +0000)]
Merge "Revert "Change activity dismiss animation to move left to right."" into cw-f-dev am: 7f2554cfb7 am: e384a782e0
am: 042c1b8d3c

Change-Id: Iab854a52d63c2dbfe811290c2d8c550cb5bd63ef

7 years agoMerge "Modify SwipeDismissLayout to perform its own exit animation" into cw-f-dev
Ned Burns [Tue, 6 Dec 2016 02:33:42 +0000 (02:33 +0000)]
Merge "Modify SwipeDismissLayout to perform its own exit animation" into cw-f-dev
am: 3601d3c239

Change-Id: I06edeb142fe780a80e679d08c0c8bf463737277b

7 years agoMerge "Modify SwipeDismissLayout to perform its own exit animation" into cw-f-dev
Ned Burns [Tue, 6 Dec 2016 02:33:28 +0000 (02:33 +0000)]
Merge "Modify SwipeDismissLayout to perform its own exit animation" into cw-f-dev
am: 3601d3c239

Change-Id: I1ec2e39a533dcd6aefc5cd337be1be45b1a75dff

7 years agoModify SwipeDismissLayout to perform its own exit animation
Ned Burns [Tue, 6 Dec 2016 02:33:23 +0000 (02:33 +0000)]
Modify SwipeDismissLayout to perform its own exit animation
am: 7d6cb913de

Change-Id: Ie9784fa9b7c878371f1e12acbb362b36fc66e023

7 years agoModify SwipeDismissLayout to perform its own exit animation
Ned Burns [Tue, 6 Dec 2016 02:33:13 +0000 (02:33 +0000)]
Modify SwipeDismissLayout to perform its own exit animation
am: 7d6cb913de

Change-Id: I17d086e1c24d9eb91a984c45b88f529006465d34

7 years agoMerge "Merge "Revert "Change activity dismiss animation to move left to right.""...
Michael Kwan [Tue, 6 Dec 2016 02:32:33 +0000 (02:32 +0000)]
Merge "Merge "Revert "Change activity dismiss animation to move left to right."" into cw-f-dev am: 7f2554cfb7 am: 615bda5be9" into nyc-mr2-dev-plus-aosp
am: 3a46ce8a89

Change-Id: If1bcc9baef33863b94b51dda7d44d4098f6bcbc3

7 years agoMerge "Revert "Change activity dismiss animation to move left to right."" into cw...
Michael Kwan [Tue, 6 Dec 2016 02:32:27 +0000 (02:32 +0000)]
Merge "Revert "Change activity dismiss animation to move left to right."" into cw-f-dev am: 7f2554cfb7 am: 615bda5be9
am: ef62f8a5cd

Change-Id: Ifac12514d2cc5c5ffda172dc22e3870b8680a40a

7 years agoMerge "Revert "Change activity dismiss animation to move left to right." am: ac9443ef...
Michael Kwan [Tue, 6 Dec 2016 02:30:39 +0000 (02:30 +0000)]
Merge "Revert "Change activity dismiss animation to move left to right." am: ac9443ef9c am: 7b1d53f1f0" into nyc-mr2-dev-plus-aosp
am: c0c7a9e844

Change-Id: I5f63b7a6d8429a45048ee3c12a94384b77811459

7 years agoRevert "Change activity dismiss animation to move left to right." am: ac9443ef9c...
Michael Kwan [Tue, 6 Dec 2016 02:30:30 +0000 (02:30 +0000)]
Revert "Change activity dismiss animation to move left to right." am: ac9443ef9c am: 7b1d53f1f0
am: d4b161198e

Change-Id: Id3db50fca8d71c3b2724a68a175b6786a274ab6e

7 years agoRevert "Change activity dismiss animation to move left to right." am: ac9443ef9c...
Michael Kwan [Tue, 6 Dec 2016 02:29:20 +0000 (02:29 +0000)]
Revert "Change activity dismiss animation to move left to right." am: ac9443ef9c am: e309596c62
am: ad12efa3d8

Change-Id: I8fd5fda273befd353e8ba4d9d645f953baee401a