Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
301,953 Commits 3 Branches 0 Tags
ec4e0b075f53ac83cb03db07c00a67ea0f1e3a34
Commit Graph

301953 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
70ae1bf4db Merge "Add Settings.Global.NETWORK_RECOMMENDATIONS_ENABLED flag." 2016-12-06 19:11:28 +00:00
Jeff Sharkey
b2c312a742 Move dump() to dumpAsync(), more oneway calls. 
When calling out to dump services hosted by external apps, use
dumpAsync() to avoid hanging if the remote process is wedged.

Test: builds, boots, runs with minimal logs triggered
Bug: 32715088
Change-Id: I70aa2666ae21dae8f09ded2063bed359c0b210c5
Merged-In: I70aa2666ae21dae8f09ded2063bed359c0b210c5
 2016-12-06 19:08:34 +00:00
pkanwar
34be302f2a DO NOT MERGE: Add notification delay for when the user needs cannot register to a 
network and needs to be notified.

BUG: 28572539
Change-Id: Iabf5e4476a1c5b02d1de38695f7125ee888dadd9
 2016-12-06 10:52:59 -08:00
Damien Bargiacchi
a8e0ed79f9 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
 2016-12-06 18:52:23 +00:00
Damien Bargiacchi
ab1da9314e Merge "Centre clock text on visible characters instead of : character" into cw-f-dev am: ad7c7acad6 am: 43b08e2fb3 
am: 81de5ef429

Change-Id: I90e188b2b4a702df9c8f5e5873f75b3cfd20cc18
 2016-12-06 18:52:14 +00:00
Damien Bargiacchi
391bf2530f 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
 2016-12-06 18:50:39 +00:00
Damien Bargiacchi
9c67c5007b Merge "Centre clock text on visible characters instead of : character" into cw-f-dev am: ad7c7acad6 am: 4ce3dee6e6 
am: 72ae53f0d3

Change-Id: I7a336c5b6bd44307b812105cd18e0555e02408a8
 2016-12-06 18:50:30 +00:00
Damien Bargiacchi
9f7dcf6efa 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
 2016-12-06 18:49:00 +00:00
Damien Bargiacchi
2dc93aab56 Centre clock text on visible characters instead of : character am: 45a7644004 am: 76a3de316c 
am: 7237200947

Change-Id: I2ff3590bdecc0331dc05f31eaac4bf7f226df8a8
 2016-12-06 18:48:51 +00:00
Damien Bargiacchi
53dd8b80a5 Centre clock text on visible characters instead of : character am: 45a7644004 am: 04f17be3e6 
am: e2ca6b465e

Change-Id: If3edabead7835e9949f1d1601cbe7cb59c0bbc4c
 2016-12-06 18:47:46 +00:00
Android Build Merger (Role)
416427e820 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 2016-12-06 18:42:28 +00:00
Android Build Merger (Role)
f72b595f68 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 2016-12-06 18:42:16 +00:00
Damien Bargiacchi
81de5ef429 Merge "Centre clock text on visible characters instead of : character" into cw-f-dev am: ad7c7acad6 
am: 43b08e2fb3

Change-Id: I62153920f518f43da399d30cc326f968035d9f34
 2016-12-06 18:41:47 +00:00
Damien Bargiacchi
72ae53f0d3 Merge "Centre clock text on visible characters instead of : character" into cw-f-dev am: ad7c7acad6 
am: 4ce3dee6e6

Change-Id: Id92ec78e061736e4b269226cecc8b73e5b19be39
 2016-12-06 18:41:38 +00:00
Android Build Merger (Role)
45a6dfa88a Merge "Centre clock text on visible characters instead of : character am: 45a7644004 am: 76a3de316c" into nyc-mr2-dev-plus-aosp 2016-12-06 18:41:28 +00:00
Damien Bargiacchi
7237200947 Centre clock text on visible characters instead of : character am: 45a7644004 
am: 76a3de316c

Change-Id: I53dd7121aea7dedf6d96fb6104c37e67784a263a
 2016-12-06 18:40:41 +00:00
Damien Bargiacchi
e2ca6b465e Centre clock text on visible characters instead of : character am: 45a7644004 
am: 04f17be3e6

Change-Id: Ia6af0064f606062a646aa3e251b56631992aa86b
 2016-12-06 18:40:39 +00:00
Damien Bargiacchi
4ce3dee6e6 Merge "Centre clock text on visible characters instead of : character" into cw-f-dev 
am: ad7c7acad6

Change-Id: Id9f91317d128f97ff849f8644f452a9bf7dd9fd2
 2016-12-06 18:32:55 +00:00
Damien Bargiacchi
04f17be3e6 Centre clock text on visible characters instead of : character 
am: 45a7644004

Change-Id: Ibb152f2217297ab0b0aa1ec622e59ae8ae815d59
 2016-12-06 18:32:48 +00:00
Damien Bargiacchi
43b08e2fb3 Merge "Centre clock text on visible characters instead of : character" into cw-f-dev 
am: ad7c7acad6

Change-Id: Ibc7e4c27b65f87c3b9396b7ae668ed9f55af6f79
 2016-12-06 18:32:45 +00:00
Damien Bargiacchi
76a3de316c Centre clock text on visible characters instead of : character 
am: 45a7644004

Change-Id: I8cf50fd314442a1e42a4cdd4c3f058d680c531dd
 2016-12-06 18:32:42 +00:00
Chad Brubaker
7f468a98f4 Add READ_PHONE_NUMBER to the list of dangerous permissions. 
Test: system_server no longer crahes when granting READ_PHONE_NUMBER
Change-Id: I45f66df9b9723a54ca7d1d29eac606136134d80a
 2016-12-06 10:31:43 -08:00
TreeHugger Robot
ad7c7acad6 Merge "Centre clock text on visible characters instead of : character" into cw-f-dev 2016-12-06 18:25:29 +00:00
Chad Brubaker
48829f90d6 Merge "Add single use App specific incoming SMSes" 2016-12-06 18:06:26 +00:00
Jeremy Joslin
b63bf2a5ef Adding a new string array resource for network recommendations. 
The new resource allows for multiple package names to be specified
in priority order.

Test: Nothing to test.
BUG: 33158362
Change-Id: Ifed73e493fe7de64b3dd051a53d16d39da1e4eef
 2016-12-06 09:59:22 -08:00
Wale Ogunwale
ee41d4afcb Introduced WindowContainer.mConsumerWrapperPool 
WindowContainer.forAllWindows(Consumer<WindowState>...) requires a lambda
to be allocated each time it is called since we need to capture the callback.
Switched to using an object pool for the process to reduce allocations.

Test: Run the allocation traker and make sure there aren't lambda allocations
      for WindowContainer.forAllWindows() method.
Change-Id: If49c1b0bd2e0a5d6d7a30ff686b5235e69a61750
 2016-12-06 09:44:12 -08:00
Mark Renouf
28f0e5bf48 Revert "Allow power button to close an input method" 
This reverts commit d28e907183.
Test: manually tested

BUG: 33038203
Change-Id: I7a4c6e95a69abb2e40df73509b6e67b93eacf6ff
 2016-12-06 17:43:28 +00:00
Wale Ogunwale
6213caa42d Revert "Revert "WindowList be gone!"" 
This reverts commit ffa5a9de0c.

Bug: 33098800
Bug: 33098294
Test: Existing tests pass.
Change-Id: I5803a010c5a224dd1cf452a4a7beb3a4c0a043f4
 2016-12-06 09:38:50 -08:00
George Mount
5a2a948be7 Fix slow exit transition left exited views INVISIBLE. 
Bug 33377297

When an exit transition was finished after the onStop was received,
the final visibilty ended up being INVISIBLE. To prevent this,
when views are being reset to the initial location, the transitions
are forced to end prior to changing the final values.

Test: I10517bb5f1477824f1e54109e7be766225591d24
Change-Id: I3837927bb41623a3a146fc3a42209c9a81c99a38
 2016-12-06 09:31:06 -08:00
Jeremy Joslin
5db1ec0de1 Adding a new string array resource for network recommendations. 
The new resource allows for multiple package names to be specified
in priority order.

Test: Nothing to test.
BUG: 33158362
Change-Id: I4a066d9220c723a17dd11e2566161fade6bb471b
 2016-12-06 09:27:02 -08:00
Jason Monk
8e9440efde resolve merge conflicts of 9600df0 to stage-aosp-master am: f120cf3d88 am: 99db203f29 
am: 14e55354c2

Change-Id: Icf3490bfe111607ae1711ceef8ade55ed0b35ec9
 2016-12-06 16:55:15 +00:00
Jason Monk
14e55354c2 resolve merge conflicts of 9600df0 to stage-aosp-master am: f120cf3d88 
am: 99db203f29

Change-Id: I908b554d4ec2adcec6c6d95c768153bcab569cbf
 2016-12-06 16:49:54 +00:00
Jason Monk
99db203f29 resolve merge conflicts of 9600df0 to stage-aosp-master 
am: f120cf3d88

Change-Id: Id2c5d4905fed661466929ed93e08e7b079c8c51d
 2016-12-06 16:43:38 +00:00
Jason Monk
f120cf3d88 resolve merge conflicts of 9600df0 to stage-aosp-master 
Change-Id: I139c64bb2440d64312d7e763e53bdb13dcb9f1aa
 2016-12-06 11:34:12 -05:00
Yifan Hong
8a004a42ec Merge "Check for nullptr when casting IBinder to IBase." am: 5014028691 am: 1abe6def68 am: fee17700af 
am: be1ea967f0

Change-Id: I9966f11aed18d4247e24b3ed0a1716096efe01e2
 2016-12-06 15:59:06 +00:00
Yifan Hong
be1ea967f0 Merge "Check for nullptr when casting IBinder to IBase." am: 5014028691 am: 1abe6def68 
am: fee17700af

Change-Id: I5b478eb2c8a6919ddaffa992b89ab1e01d63bb9e
 2016-12-06 15:53:55 +00:00
Svet Ganov
e9b8dbd58f Merge "[DO NOT MERGE] Allow multiple toasts for the focused app" into nyc-mr2-dev am: a6dbd4934c 
am: e5276464f7  -s ours

Change-Id: I131324741da2c4c3ed9a3160231bb482d2b0882e
 2016-12-06 15:47:27 +00:00
Svet Ganov
8e45727337 [DO NOT MERGE] Allow multiple toasts for the focused app am: 296a60acc3 
am: bcc880d6f6  -s ours

Change-Id: I0c0cc17cfa1f53b99fb9d002d695015efb3df7f7
 2016-12-06 15:46:35 +00:00
Yifan Hong
fee17700af Merge "Check for nullptr when casting IBinder to IBase." am: 5014028691 
am: 1abe6def68

Change-Id: I532e548c9558dada977ca1926ef4b7e39215924f
 2016-12-06 15:45:33 +00:00
TreeHugger Robot
aa0ab14258 Merge "Import translations. DO NOT MERGE" 2016-12-06 15:41:39 +00:00
Svet Ganov
e5276464f7 Merge "[DO NOT MERGE] Allow multiple toasts for the focused app" into nyc-mr2-dev 
am: a6dbd4934c

Change-Id: If21ce32f0c7e6652a4185c5f10c2157e078f8217
 2016-12-06 15:39:07 +00:00
Yifan Hong
1abe6def68 Merge "Check for nullptr when casting IBinder to IBase." 
am: 5014028691

Change-Id: I4a3c320351a9afa305a40e3912cc2e968494497c
 2016-12-06 15:39:02 +00:00
Svet Ganov
bcc880d6f6 [DO NOT MERGE] Allow multiple toasts for the focused app 
am: 296a60acc3

Change-Id: If076e3af0033447eb074ba45721205974cb763a4
 2016-12-06 15:39:01 +00:00
TreeHugger Robot
7b54c555ea Merge "Import translations. DO NOT MERGE" 2016-12-06 15:39:00 +00:00
TreeHugger Robot
4addf4d158 Merge "Import translations. DO NOT MERGE" 2016-12-06 15:38:38 +00:00
TreeHugger Robot
7fe7a43a21 Merge "Import translations. DO NOT MERGE" 2016-12-06 15:38:07 +00:00
Jeremy Joslin
1397837af3 API for requesting network recommendations. 
Defining a new system API that will allow the system to request
network recommendations from a NetworkScoreService implementation.

Test: Coming after the API is approved.
BUG: 32909424
Change-Id: I2d5c0a843b928b04e87c1862a78702a02fd54c31
 2016-12-06 07:33:25 -08:00
Narayan Kamath
579e2faf38 Merge "PackageParser: Add support for caching parse results on the file system." 2016-12-06 15:24:07 +00:00
TreeHugger Robot
a6dbd4934c Merge "[DO NOT MERGE] Allow multiple toasts for the focused app" into nyc-mr2-dev 2016-12-06 15:19:55 +00:00
Jason Monk
9600df035b Merge "Fix Hotspot tile is shown on Guest user" 2016-12-06 15:11:19 +00:00