OSDN Git Service

android-x86/frameworks-base.git
7 years agoDO NOT MERGE - Port 2D recents implementation from master to nyc-mr2
Manu Cornet [Tue, 20 Dec 2016 21:57:08 +0000 (21:57 +0000)]
DO NOT MERGE - Port 2D recents implementation from master to nyc-mr2
am: bf8e290376

Change-Id: I7b05418dc2d03da33e862cf67dbcd1d08cb1b899

7 years agoMerge "sysui: update sw900dp navbar sizes" into nyc-mr2-dev
Xiaohui Chen [Tue, 20 Dec 2016 21:52:46 +0000 (21:52 +0000)]
Merge "sysui: update sw900dp navbar sizes" into nyc-mr2-dev
am: 2d6accd7a9

Change-Id: I07ef49f3fd5fa3ab364f5b527c4e21a1c96e6b3d

7 years agosysui: update sw900dp navbar sizes
Xiaohui Chen [Tue, 20 Dec 2016 21:52:41 +0000 (21:52 +0000)]
sysui: update sw900dp navbar sizes
am: c48f07bc82

Change-Id: Ia9bfece57902625c72eda216464344a40bd25db7

7 years agoMerge "sysui: update sw900dp navbar sizes" into nyc-mr2-dev
Xiaohui Chen [Tue, 20 Dec 2016 21:44:22 +0000 (21:44 +0000)]
Merge "sysui: update sw900dp navbar sizes" into nyc-mr2-dev

7 years agoMerge "Adds carrier config to determine if high definition audio is displayed" am...
Hall Liu [Tue, 20 Dec 2016 21:36:12 +0000 (21:36 +0000)]
Merge "Adds carrier config to determine if high definition audio is displayed" am: 26e5096364 am: fc125a319e
am: 57c781417f  -s ours

Change-Id: Ic021a41d713aaa4f8a4af6cdcc1560b7b718b6e8

7 years agoMerge "Bluetooth: persist state when turning on from BLE" am: 8e9551bacf am: e6164ca72a
Andre Eisenbach [Tue, 20 Dec 2016 21:35:03 +0000 (21:35 +0000)]
Merge "Bluetooth: persist state when turning on from BLE" am: 8e9551bacf am: e6164ca72a
am: bf43955a6b

Change-Id: I2d41410fcdb6824e45027412a7b80e16af797346

7 years agoMerge "Adds carrier config to determine if high definition audio is displayed" am...
Hall Liu [Tue, 20 Dec 2016 21:28:12 +0000 (21:28 +0000)]
Merge "Adds carrier config to determine if high definition audio is displayed" am: 26e5096364
am: fc125a319e

Change-Id: I305223c2a5499b9fdf2f1f59ddfda40712cd6172

7 years agoMerge "Bluetooth: persist state when turning on from BLE" am: 8e9551bacf
Andre Eisenbach [Tue, 20 Dec 2016 21:27:05 +0000 (21:27 +0000)]
Merge "Bluetooth: persist state when turning on from BLE" am: 8e9551bacf
am: e6164ca72a

Change-Id: I7c27d09c83daf73817585f2713bd2f05b97cd525

7 years agoMerge "Adds carrier config to determine if high definition audio is displayed"
Hall Liu [Tue, 20 Dec 2016 21:19:43 +0000 (21:19 +0000)]
Merge "Adds carrier config to determine if high definition audio is displayed"
am: 26e5096364

Change-Id: I2ce0958075ec3bd2c337993516ad06ffd264d594

7 years agoMerge "Bluetooth: persist state when turning on from BLE"
Andre Eisenbach [Tue, 20 Dec 2016 21:18:35 +0000 (21:18 +0000)]
Merge "Bluetooth: persist state when turning on from BLE"
am: 8e9551bacf

Change-Id: Iad69e2f184df54ffbb2d7169e45345c80547b010

7 years agoMerge "Adds carrier config to determine if high definition audio is displayed"
Hall Liu [Tue, 20 Dec 2016 21:13:31 +0000 (21:13 +0000)]
Merge "Adds carrier config to determine if high definition audio is displayed"

7 years agoMerge "Add Wi-Fi quality badge icons." am: edb8982c31 am: 061d4fff4b
Amin Shaikh [Tue, 20 Dec 2016 21:12:55 +0000 (21:12 +0000)]
Merge "Add Wi-Fi quality badge icons." am: edb8982c31 am: 061d4fff4b
am: 99a19e8116

Change-Id: I68d8c31057da94ce90d4193ef2813646782746fa

7 years agoMerge "Bluetooth: persist state when turning on from BLE"
Andre Eisenbach [Tue, 20 Dec 2016 21:11:58 +0000 (21:11 +0000)]
Merge "Bluetooth: persist state when turning on from BLE"

7 years agoBluetooth: persist state when turning on from BLE
Marie Janssen [Tue, 20 Dec 2016 19:21:12 +0000 (11:21 -0800)]
Bluetooth: persist state when turning on from BLE

Test: in BLE_ON state, turn to full on, reboot phone
Bug: 33777496
Change-Id: I246d6ff0dcb81d66aa915ef443040d6fc3c98310

7 years agoMerge "Permit 65535 byte ZIP comments and empty Central Directory" am: f420b91e26...
Alex Klyubin [Tue, 20 Dec 2016 21:05:15 +0000 (21:05 +0000)]
Merge "Permit 65535 byte ZIP comments and empty Central Directory" am: f420b91e26 am: be81b50b6e
am: e1bc33228e

Change-Id: I80c703f7784436414263fb86f56b7c85a6da40e7

7 years agoMerge "Add Wi-Fi quality badge icons." am: edb8982c31
Amin Shaikh [Tue, 20 Dec 2016 20:53:32 +0000 (20:53 +0000)]
Merge "Add Wi-Fi quality badge icons." am: edb8982c31
am: 061d4fff4b

Change-Id: I25b230cbc51cd7079d2c73d116c9e4550fc5b02e

7 years agoMerge "Permit 65535 byte ZIP comments and empty Central Directory" am: f420b91e26
Alex Klyubin [Tue, 20 Dec 2016 20:45:59 +0000 (20:45 +0000)]
Merge "Permit 65535 byte ZIP comments and empty Central Directory" am: f420b91e26
am: be81b50b6e

Change-Id: I1275903e7fda6bdd9c1012bc7cfb6c42f6b43304

7 years agoMerge "Add Wi-Fi quality badge icons."
Amin Shaikh [Tue, 20 Dec 2016 20:24:31 +0000 (20:24 +0000)]
Merge "Add Wi-Fi quality badge icons."
am: edb8982c31

Change-Id: I43d4f52e26eb7514b177d10769d6a5e3fc78f386

7 years agoMerge "Add Wi-Fi quality badge icons."
Treehugger Robot [Tue, 20 Dec 2016 20:13:59 +0000 (20:13 +0000)]
Merge "Add Wi-Fi quality badge icons."

7 years agoDO NOT MERGE - Port 2D recents implementation from master to nyc-mr2
Manu Cornet [Tue, 20 Dec 2016 16:29:33 +0000 (08:29 -0800)]
DO NOT MERGE - Port 2D recents implementation from master to nyc-mr2

Bug: 32101881
Test: Checked Recents layout/behavior on local sw600dp device
Change-Id: I40be7dbaf8bc017b4c7c449f9bca657817107ceb

7 years agoMerge "DO NOT MERGE Show notification when network logging is enabled" into nyc-mr2-dev
Philipp Weiß [Tue, 20 Dec 2016 20:01:38 +0000 (20:01 +0000)]
Merge "DO NOT MERGE Show notification when network logging is enabled" into nyc-mr2-dev
am: 2f42cbcad5

Change-Id: I3464a515734350bbd9b411932b2d6616a7ffcd58

7 years agoDO NOT MERGE Show notification when network logging is enabled
phweiss [Tue, 20 Dec 2016 20:01:33 +0000 (20:01 +0000)]
DO NOT MERGE Show notification when network logging is enabled
am: 923d2cc9d9

Change-Id: Ia5839248361a7d7fbb0c73cdb569ada62a96c286

7 years agoMerge "DO NOT MERGE Show notification when network logging is enabled" into nyc-mr2-dev
Philipp Weiß [Tue, 20 Dec 2016 19:52:04 +0000 (19:52 +0000)]
Merge "DO NOT MERGE Show notification when network logging is enabled" into nyc-mr2-dev

7 years agoMerge "Permit 65535 byte ZIP comments and empty Central Directory"
Alex Klyubin [Tue, 20 Dec 2016 18:45:57 +0000 (18:45 +0000)]
Merge "Permit 65535 byte ZIP comments and empty Central Directory"
am: f420b91e26

Change-Id: Ic178cdd9043c171f2f51643212e34b642657abe9

7 years agoAdd Wi-Fi quality badge icons.
Amin Shaikh [Sat, 17 Dec 2016 04:37:48 +0000 (20:37 -0800)]
Add Wi-Fi quality badge icons.

Test: make
Bug: 33705924
Change-Id: I6ae9fab369151e6c2d3769d7ba4a20103368f0a0

7 years agoMerge "Permit 65535 byte ZIP comments and empty Central Directory"
Alex Klyubin [Tue, 20 Dec 2016 18:33:28 +0000 (18:33 +0000)]
Merge "Permit 65535 byte ZIP comments and empty Central Directory"

7 years agoDO NOT MERGE Show notification when network logging is enabled
phweiss [Wed, 14 Dec 2016 20:37:48 +0000 (21:37 +0100)]
DO NOT MERGE Show notification when network logging is enabled

A notification is shown after network logging is enabled
and after the next three reboots that are at least one day apart.

Clicking it sends an intent to quick settings to shown its device monitoring
dialog.

Cherry-picked from master.

Bug: 29748723
Bug: 33126577

(cherry-picked from commit a0cb251ca6a8ea8df17ff8089573bc50f2f1849f)

Test: Manual, CTS-Verifier tests will be added later
Change-Id: I2bf517bd27ab23ad3f66270602dbf062efab8cbb

7 years agoMerge "DO NOT MERGE Rework Device Monitoring Dialog in Quicksettings" into nyc-mr2-dev
Philipp Weiß [Tue, 20 Dec 2016 18:06:53 +0000 (18:06 +0000)]
Merge "DO NOT MERGE Rework Device Monitoring Dialog in Quicksettings" into nyc-mr2-dev
am: 4d3aa8e8ab

Change-Id: Ibba35390892874fc32c0f9cebd50077b617e5e96

7 years agoDO NOT MERGE Rework Device Monitoring Dialog in Quicksettings
phweiss [Tue, 20 Dec 2016 18:06:47 +0000 (18:06 +0000)]
DO NOT MERGE Rework Device Monitoring Dialog in Quicksettings
am: 2f512047c2

Change-Id: If56eee8a498435aaa059990eceea9555897e11b9

7 years agoMerge "DO NOT MERGE Rework Device Monitoring Dialog in Quicksettings" into nyc-mr2-dev
Philipp Weiß [Tue, 20 Dec 2016 17:57:34 +0000 (17:57 +0000)]
Merge "DO NOT MERGE Rework Device Monitoring Dialog in Quicksettings" into nyc-mr2-dev

7 years agoDO NOT MERGE: Cross profile candidate should be considered
Tony Mak [Tue, 20 Dec 2016 16:57:44 +0000 (16:57 +0000)]
DO NOT MERGE: Cross profile candidate should be considered
am: ff11122ddc

Change-Id: I9de28d980021579d70d85193b1994ddca042d4fa

7 years agoDO NOT MERGE: Cross profile candidate should be considered
Tony Mak [Wed, 2 Nov 2016 10:26:45 +0000 (10:26 +0000)]
DO NOT MERGE: Cross profile candidate should be considered

Bug: 32547783

Fixed the regression introduced in 8e2d9d1d9050e93b15c54e992698325c7d4aa57c

Test: Manual test - Open a map link in work calendar, personal map is shown as an option.

Change-Id: If5651b5e09cf1916813e8f91dbdcdf53f9119ef2
(cherry picked from commit 9f2c93663c2de84f958eebef96a98458ebaf51a9)

7 years agoDO NOT MERGE Rework Device Monitoring Dialog in Quicksettings
phweiss [Fri, 2 Dec 2016 13:31:04 +0000 (14:31 +0100)]
DO NOT MERGE Rework Device Monitoring Dialog in Quicksettings

If a device owner is active, the layout is changed from a
standard AlertDialog with only one string to a custom dialog
that includes information on Device Owners, and VPN and Network Logging,
if enabled.

Cherry-picked from master and modified to not rely on changes that are not in
N:

A change in master renamed some variables in QSFooter.createDialog() and made
them final, this change is also included here.

The owner's organization name cannot be set in N.

In the case of active Device Owner and active VPN, there was a specialized
string for this in N. This string was now replaced by using the simpler
Device Owner string + an own entry for VPN in the new layout.

Some imports had to be included that were already there on master.

The dimen-tag throws an error message on floats during build, replaced by an
item-tag.

BUG: 29748723
BUG: 33126622
Test: Manual, CTS-Verifier tests will be added later

(cherry picked from commit 9e450e12330d4cfe7843613c79f1c3671d08305f)

Change-Id: I2bfca9d9d02a42d9c3b17683625eda29e9369666

7 years agoDO NOT MERGE Stricter NetworkNotificationManagerTest
Hugo Benichi [Tue, 20 Dec 2016 06:49:08 +0000 (06:49 +0000)]
DO NOT MERGE Stricter NetworkNotificationManagerTest
am: a865790a5b

Change-Id: I94ea5c6994d181e730ec4f49e98001eb81ed8740

7 years agoMerge "Implement the request and recommend calls." am: 1e814b3928 am: b50fdc7faa
Jeremy Joslin [Tue, 20 Dec 2016 06:37:11 +0000 (06:37 +0000)]
Merge "Implement the request and recommend calls." am: 1e814b3928 am: b50fdc7faa
am: 949893f5b2

Change-Id: Ibd03bace49bc277a2777c8483da6b4ebfc56d217

7 years agoMerge "Implement the request and recommend calls." am: 1e814b3928
Jeremy Joslin [Tue, 20 Dec 2016 06:32:42 +0000 (06:32 +0000)]
Merge "Implement the request and recommend calls." am: 1e814b3928
am: b50fdc7faa

Change-Id: I81f998b6934715f43797247f411919a4ceee5631

7 years agoMerge "Implement the request and recommend calls."
Jeremy Joslin [Tue, 20 Dec 2016 06:25:08 +0000 (06:25 +0000)]
Merge "Implement the request and recommend calls."
am: 1e814b3928

Change-Id: I91c905ab2fc7e061462fb96c2c81a783aa93a391

7 years agoMerge "Implement the request and recommend calls."
Treehugger Robot [Tue, 20 Dec 2016 06:16:03 +0000 (06:16 +0000)]
Merge "Implement the request and recommend calls."

7 years agoMerge changes I40064d3e,I50594ad8 into nyc-mr2-dev
Paul Stewart [Tue, 20 Dec 2016 05:04:55 +0000 (05:04 +0000)]
Merge changes I40064d3e,I50594ad8 into nyc-mr2-dev
am: 7eaec196b7

Change-Id: I85c6652d8cdfc387b27fe2a11026c05b5df667a5

7 years agoDO NOT MERGE Fix other String.format issues in NetworkNotificationManager.java
Paul Stewart [Tue, 20 Dec 2016 05:04:46 +0000 (05:04 +0000)]
DO NOT MERGE Fix other String.format issues in NetworkNotificationManager.java
am: 8e21030679

Change-Id: I79c4129b861b9dd93ac14acce5a86aadd48e8d39

7 years agoDO NOT MERGE Fix malformed log statement.
Joe LaPenna [Tue, 20 Dec 2016 05:04:02 +0000 (05:04 +0000)]
DO NOT MERGE Fix malformed log statement.
am: 02ca23d9a2

Change-Id: Ie52f24f39305f325e01972f5046247482053db28

7 years agoDO NOT MERGE Stricter NetworkNotificationManagerTest
Hugo Benichi [Tue, 20 Dec 2016 00:57:43 +0000 (09:57 +0900)]
DO NOT MERGE Stricter NetworkNotificationManagerTest

This patch changes NetworkNotificationManagerTest to populate extraInfo
of NetworkInfo in order to catch regressions in malformed format Strings
of log statements in NetworkNotificationManager.

Test: verified that the test fails when reintroducing the format String
bug.
Bug: 33737715

Change-Id: If14063554b8246d9d80cd222cb41c30dee121c5a

7 years agoMerge changes I40064d3e,I50594ad8 into nyc-mr2-dev
TreeHugger Robot [Tue, 20 Dec 2016 04:58:51 +0000 (04:58 +0000)]
Merge changes I40064d3e,I50594ad8 into nyc-mr2-dev

* changes:
  DO NOT MERGE Fix other String.format issues in NetworkNotificationManager.java
  DO NOT MERGE Fix malformed log statement.

7 years agoMerge "Implement the discovery of a network recommendation provider." am: 470d256519...
Jeremy Joslin [Tue, 20 Dec 2016 03:37:58 +0000 (03:37 +0000)]
Merge "Implement the discovery of a network recommendation provider." am: 470d256519 am: 8fbeb1d74a
am: af811c2650

Change-Id: I18d4c618f78796cbbe6d895c5b2f888c4a9a55ff

7 years agoMerge "Implement the discovery of a network recommendation provider." am: 470d256519
Jeremy Joslin [Tue, 20 Dec 2016 03:34:02 +0000 (03:34 +0000)]
Merge "Implement the discovery of a network recommendation provider." am: 470d256519
am: 8fbeb1d74a

Change-Id: I322592326e0a409131a4dd33ab1f907b9262dbf2

7 years agoDO NOT MERGE Fix other String.format issues in NetworkNotificationManager.java
Paul Stewart [Mon, 19 Dec 2016 16:45:32 +0000 (08:45 -0800)]
DO NOT MERGE Fix other String.format issues in NetworkNotificationManager.java

Commit fb2609d3eee1c7a4dda889c000f32183a044978a added a string
format which caused an exception.  On top of the fixes to this
from e1406167186c2cabe683b3c1511ad6733e9106c9, we can also fix
a few more issues here with some missing arguments to other
String.format invocations in the aforementioned CL, and other
formatting problems.

Bug: 33737715
Test: Build and run SUW

(cherry picked from commit 835cb49639fc7cb75819564fa15f2f5a0bd5dee2)

Change-Id: I40064d3e1a0f0300c43bdbc51839b579a5394a36

7 years agoDO NOT MERGE Fix malformed log statement.
Joe LaPenna [Mon, 19 Dec 2016 18:31:14 +0000 (10:31 -0800)]
DO NOT MERGE Fix malformed log statement.

Introduced in I1201d1d4fab8183dd83449c2afb2c35cfece883f

BUG: 33746580

Test: built, triggered notification, no crash.

(cherry picked from commit e1406167186c2cabe683b3c1511ad6733e9106c9)

Change-Id: I50594ad865e6f95abc5c67c58af604ef2aa88f9b

7 years agoMerge "Implement the discovery of a network recommendation provider."
Jeremy Joslin [Tue, 20 Dec 2016 03:26:04 +0000 (03:26 +0000)]
Merge "Implement the discovery of a network recommendation provider."
am: 470d256519

Change-Id: I804df594669be3b42704dead7007790666bef0f6

7 years agoMerge "Implement the discovery of a network recommendation provider."
Treehugger Robot [Tue, 20 Dec 2016 03:16:31 +0000 (03:16 +0000)]
Merge "Implement the discovery of a network recommendation provider."

7 years agoImplement the request and recommend calls.
Jeremy Joslin [Fri, 9 Dec 2016 21:11:51 +0000 (13:11 -0800)]
Implement the request and recommend calls.

Implemented requestRecommendation() and requestScores() to call
through to the bound network recommendation provider if available.

BUG: 33593157
BUG: 33668692
Test: runtest frameworks-services -c com.android.server.NetworkScoreServiceTest
Change-Id: I055251fa94d93d4ea4e5001c4ec6c1dfb626d1b2
Merged-In: I8e2ed73dc6876deb1a8bd47bcaeaca8db68f3a44

7 years agoImplement the discovery of a network recommendation provider.
Jeremy Joslin [Tue, 6 Dec 2016 15:42:38 +0000 (07:42 -0800)]
Implement the discovery of a network recommendation provider.

Updated the NetworkScorerAppManager to examine the list of configured
network recommendation providers and to select the first valid
provider.

As part of this update the old logic of looking for a valid network
scorer has been removed. Scorers/recommendation providers are only
selected from the configured list now. The setActiveScorer() method
has been deprecated as a result.

The NetworkScoreService has been updated to monitor the list of
potential recommendation providers and to reevaluate the binding
whenever they change. It also monitors the new setting for
NETWORK_RECOMMENDATIONS_ENABLED to connect or disconnect from the
provider as needed.

Test: runtest frameworks-services -c com.android.server.NetworkScoreServiceTest
BUG: 33158362
Change-Id: I450981261aa5355c1c91ec2e3a0a3b58cc65316b
Merged-In: I42aeb5223da794f71f7e58cb1bdf18817200cbf2

7 years agoMerge "Remove ~1/3 of the installd calls at boot." am: 5bc305b97c am: d948865e27
Jeff Sharkey [Tue, 20 Dec 2016 01:25:19 +0000 (01:25 +0000)]
Merge "Remove ~1/3 of the installd calls at boot." am: 5bc305b97c am: d948865e27
am: e36f449c90

Change-Id: I818578f22a8988a141636694ae3811ad2d45f52e

7 years agoMerge "Remove ~1/3 of the installd calls at boot." am: 5bc305b97c
Jeff Sharkey [Tue, 20 Dec 2016 01:18:38 +0000 (01:18 +0000)]
Merge "Remove ~1/3 of the installd calls at boot." am: 5bc305b97c
am: d948865e27

Change-Id: Iaf9d7f9a3f7d2fd34a11ec2ee80d849fc7dd0078

7 years agoMerge "Remove ~1/3 of the installd calls at boot."
Jeff Sharkey [Tue, 20 Dec 2016 01:14:35 +0000 (01:14 +0000)]
Merge "Remove ~1/3 of the installd calls at boot."
am: 5bc305b97c

Change-Id: Ia6af8d920971118f108320d08b15cbe3da59b28a

7 years agoMerge "Migrate system+lock wallpaper to lock-only when setting live wp" into nyc...
Chris Tate [Tue, 20 Dec 2016 01:10:22 +0000 (01:10 +0000)]
Merge "Migrate system+lock wallpaper to lock-only when setting live wp" into nyc-mr2-dev
am: 793c634d1e

Change-Id: I11f490cd67f31816abf0ed4dbed481eb9b21d6cf

7 years agoMigrate system+lock wallpaper to lock-only when setting live wp
Christopher Tate [Tue, 20 Dec 2016 01:10:16 +0000 (01:10 +0000)]
Migrate system+lock wallpaper to lock-only when setting live wp
am: 7cd0010df6

Change-Id: I488880ddcb04894d18535815691d32d542bc71c1

7 years agoMerge "Remove ~1/3 of the installd calls at boot."
Treehugger Robot [Tue, 20 Dec 2016 01:06:22 +0000 (01:06 +0000)]
Merge "Remove ~1/3 of the installd calls at boot."

7 years agoMerge "Migrate system+lock wallpaper to lock-only when setting live wp" into nyc...
Chris Tate [Tue, 20 Dec 2016 01:01:52 +0000 (01:01 +0000)]
Merge "Migrate system+lock wallpaper to lock-only when setting live wp" into nyc-mr2-dev

7 years agosysui: update sw900dp navbar sizes
Xiaohui Chen [Tue, 20 Dec 2016 00:33:16 +0000 (16:33 -0800)]
sysui: update sw900dp navbar sizes

Bug: 32516898
Change-Id: I3e1a2855fa3cb2f538bf87df3d48ac3dcfc4c67a

7 years agoRemove ~1/3 of the installd calls at boot.
Jeff Sharkey [Mon, 19 Dec 2016 23:39:02 +0000 (16:39 -0700)]
Remove ~1/3 of the installd calls at boot.

When preparing CE storage for an app, we always perform a second call
to extract any newly created CE directory inode.  Let's simplify this
and just return the inode number from the createAppData() call.

Test: builds, boots, reads CE inodes after wipe
Bug: 33463450
Change-Id: I9b73da576800b56d7d0961dd4deb0b6a546acbe7

7 years agoMigrate system+lock wallpaper to lock-only when setting live wp
Christopher Tate [Mon, 19 Dec 2016 22:38:44 +0000 (14:38 -0800)]
Migrate system+lock wallpaper to lock-only when setting live wp

If the static imagery is shared between system+lock, preserve the lock
presentation when setting a different system-surface live wallpaper.  If
the caller knows it wants to achieve system+lock display of the new live
wallpaper, it follows up setWallpaperComponent() with an explicit clear
of the lock wallpaper state.

Previously, setting a new system live wallpaper would necessarily override
a desired static lock image in the case of system+lock shared imagery.
Now it doesn't.

Bug 32664317

Change-Id: I7ef2cded534f9e6e91899db4c37bd24efaf09fee

7 years agoMerge "Fix ScanResult array parceling." am: 5fdc86fb27 am: 68764eabb7
Jeremy Joslin [Mon, 19 Dec 2016 22:18:37 +0000 (22:18 +0000)]
Merge "Fix ScanResult array parceling." am: 5fdc86fb27 am: 68764eabb7
am: 5b1a460b94

Change-Id: I52289854a38a36929cd9b8d20e85b00346b3317c

7 years agoMerge "Fix ScanResult array parceling." am: 5fdc86fb27
Jeremy Joslin [Mon, 19 Dec 2016 22:14:37 +0000 (22:14 +0000)]
Merge "Fix ScanResult array parceling." am: 5fdc86fb27
am: 68764eabb7

Change-Id: I6b44179d634722828f40524c26ccf6ea51521f11

7 years agoMerge "Fix ScanResult array parceling."
Jeremy Joslin [Mon, 19 Dec 2016 22:07:20 +0000 (22:07 +0000)]
Merge "Fix ScanResult array parceling."
am: 5fdc86fb27

Change-Id: I25e509ea057370c4380764c47808c0dbde85a6fc

7 years agoMerge "Fix ScanResult array parceling."
Treehugger Robot [Mon, 19 Dec 2016 21:57:05 +0000 (21:57 +0000)]
Merge "Fix ScanResult array parceling."

7 years agoMerge "Remove "final" from ResultCallback." am: b60d7b334c am: 8df12d98f7
Joe LaPenna [Mon, 19 Dec 2016 21:13:31 +0000 (21:13 +0000)]
Merge "Remove "final" from ResultCallback." am: b60d7b334c am: 8df12d98f7
am: 8c5eb9b10f

Change-Id: I9a234d6176c441b424714dda1de4ec580a12e2c5

7 years agoMerge "Start sensor service in a seperate thread" into nyc-mr2-dev
Wei Wang [Mon, 19 Dec 2016 21:08:48 +0000 (21:08 +0000)]
Merge "Start sensor service in a seperate thread" into nyc-mr2-dev
am: 9ec4256a17

Change-Id: I0956ba96241ccb9df18ba9f2bfd29cc952659b1a

7 years agoStart sensor service in a seperate thread
Wei Wang [Mon, 19 Dec 2016 21:08:22 +0000 (21:08 +0000)]
Start sensor service in a seperate thread
am: 6ba0ef31e8

Change-Id: I325b0d5c02326355c7b04962537e695e7839be09

7 years agoMerge "Remove "final" from ResultCallback." am: b60d7b334c
Joe LaPenna [Mon, 19 Dec 2016 21:07:29 +0000 (21:07 +0000)]
Merge "Remove "final" from ResultCallback." am: b60d7b334c
am: 8df12d98f7

Change-Id: Ia0266003bff04bf0ec5b3ee7134678c1b1f0e77f

7 years agoMerge "docs: remove implicit intent from bindService and startService" into nyc-mr1...
Mark Lu [Mon, 19 Dec 2016 21:05:45 +0000 (21:05 +0000)]
Merge "docs: remove implicit intent from bindService and startService" into nyc-mr1-dev am: cbfb58c9d7 am: 70fa908fb2
am: fa0c9f2352

Change-Id: I845121e5e638fff86c0915213cf3ce87fc914918

7 years agodocs: remove implicit intent from bindService and startService am: 94ebbe0e58 am...
Mark Lu [Mon, 19 Dec 2016 21:04:11 +0000 (21:04 +0000)]
docs: remove implicit intent from bindService and startService am: 94ebbe0e58 am: d7c29565ba
am: a8107e1074

Change-Id: I39ffafde9285c62d27cf1559d215dd687dbe4aec

7 years agodocs: update Paint.setTextSize() to indicate pixel units am: 5f05256106 am: 9c834b1241
Mark Lu [Mon, 19 Dec 2016 21:02:57 +0000 (21:02 +0000)]
docs: update Paint.setTextSize() to indicate pixel units am: 5f05256106 am: 9c834b1241
am: 353e197a8a

Change-Id: I4b338888e82cd7e524db0f04b4a2cb3b725d1109

7 years agoMerge "Add UI prompt for MMI code failure on 3gpp" into nyc-mr2-dev
Brad Ebinger [Mon, 19 Dec 2016 21:01:41 +0000 (21:01 +0000)]
Merge "Add UI prompt for MMI code failure on 3gpp" into nyc-mr2-dev
am: 73dcab62b7  -s ours

Change-Id: Id30938ad8395a57b7a39becd3c7834df75b2ba07

7 years agoMerge "Remove "final" from ResultCallback."
Joe LaPenna [Mon, 19 Dec 2016 21:01:26 +0000 (21:01 +0000)]
Merge "Remove "final" from ResultCallback."
am: b60d7b334c

Change-Id: I3b6679368418af3992007f58d47c544cf7a1b1ed

7 years agoMerge "Start sensor service in a seperate thread" into nyc-mr2-dev
TreeHugger Robot [Mon, 19 Dec 2016 20:59:12 +0000 (20:59 +0000)]
Merge "Start sensor service in a seperate thread" into nyc-mr2-dev

7 years agoAdd UI prompt for MMI code failure on 3gpp
Brad Ebinger [Mon, 19 Dec 2016 20:54:27 +0000 (20:54 +0000)]
Add UI prompt for MMI code failure on 3gpp
am: ac8d8e7358

Change-Id: Id83a2fa2dd958a0fbfcb2d5eb90528bcf96737b8

7 years agoMerge "Remove "final" from ResultCallback."
Treehugger Robot [Mon, 19 Dec 2016 20:54:13 +0000 (20:54 +0000)]
Merge "Remove "final" from ResultCallback."

7 years agoPermit 65535 byte ZIP comments and empty Central Directory
Alex Klyubin [Mon, 19 Dec 2016 18:52:52 +0000 (10:52 -0800)]
Permit 65535 byte ZIP comments and empty Central Directory

This fixes two cosmetic issues in APK Signature Scheme v2 signature
verifier in Android Package Manager:
* Accept APKs with ZIP End of Central Directory comment of length
  65535. Previously, only comments of length 65534 were accepted due
  to a off by one bug.
* Accept APKs with empty ZIP Central Directory.

These issues should not affect actual APKs because they cannot have an
empty ZIP Central Directory (they must contain at least the
AndroidManifest.xml entry) and shouldn't contain any comments in ZIP
End of Central Directory.

Test: cts-tradefed run singleCommand cts --skip-device-info --skip-preconditions --skip-connectivity-check --abi arm64-v8a --module CtsAppSecurityHostTestCases -t android.appsecurity.cts.PkgInstallSignatureVerificationTest
Change-Id: I461c43472fa97c04e7579d129a6053e44233adb7

7 years agoMerge "docs: remove implicit intent from bindService and startService" into nyc-mr1...
Mark Lu [Mon, 19 Dec 2016 20:35:27 +0000 (20:35 +0000)]
Merge "docs: remove implicit intent from bindService and startService" into nyc-mr1-dev am: cbfb58c9d7 am: 70fa908fb2
am: 6461737fa5

Change-Id: I37fab5a4733b27a359800cc4cf0f3982f209a8f8

7 years agodocs: remove implicit intent from bindService and startService am: 94ebbe0e58 am...
Mark Lu [Mon, 19 Dec 2016 20:34:23 +0000 (20:34 +0000)]
docs: remove implicit intent from bindService and startService am: 94ebbe0e58 am: d7c29565ba
am: 8c232935f0

Change-Id: I45cdec5b2820a4a95a8aa6e1b67856891a8a6cd5

7 years agoMerge "docs: remove implicit intent from bindService and startService" into nyc-mr1...
Mark Lu [Mon, 19 Dec 2016 20:29:08 +0000 (20:29 +0000)]
Merge "docs: remove implicit intent from bindService and startService" into nyc-mr1-dev am: cbfb58c9d7
am: 70fa908fb2

Change-Id: I6b37ea3bf8b451b941b49b3124b226a641b28b64

7 years agoMerge "docs: remove implicit intent from bindService and startService" into nyc-mr1...
Mark Lu [Mon, 19 Dec 2016 20:28:59 +0000 (20:28 +0000)]
Merge "docs: remove implicit intent from bindService and startService" into nyc-mr1-dev am: cbfb58c9d7
am: 70fa908fb2

Change-Id: I1eab802afe75f847555baa8964030a1bb994107a

7 years agodocs: remove implicit intent from bindService and startService am: 94ebbe0e58
Mark Lu [Mon, 19 Dec 2016 20:27:56 +0000 (20:27 +0000)]
docs: remove implicit intent from bindService and startService am: 94ebbe0e58
am: d7c29565ba

Change-Id: Ife9581030d8579d6e2dd625814a049d5f488229a

7 years agodocs: remove implicit intent from bindService and startService am: 94ebbe0e58
Mark Lu [Mon, 19 Dec 2016 20:27:52 +0000 (20:27 +0000)]
docs: remove implicit intent from bindService and startService am: 94ebbe0e58
am: d7c29565ba

Change-Id: I44109d60ff26725daf6ebbce50bac9a7068146fe

7 years agodocs: update Paint.setTextSize() to indicate pixel units am: 5f05256106 am: 9c834b1241
Mark Lu [Mon, 19 Dec 2016 20:27:51 +0000 (20:27 +0000)]
docs: update Paint.setTextSize() to indicate pixel units am: 5f05256106 am: 9c834b1241
am: 4da3266828

Change-Id: I65e2a1c43bd049e5c4cada55e8689ecc98a70fa5

7 years agoMerge "docs: remove implicit intent from bindService and startService" into nyc-mr1-dev
Mark Lu [Mon, 19 Dec 2016 20:22:00 +0000 (20:22 +0000)]
Merge "docs: remove implicit intent from bindService and startService" into nyc-mr1-dev
am: cbfb58c9d7

Change-Id: If12008d4e9fe1883c6c4f21e6e6736045b325182

7 years agodocs: remove implicit intent from bindService and startService
Mark Lu [Mon, 19 Dec 2016 20:21:57 +0000 (20:21 +0000)]
docs: remove implicit intent from bindService and startService
am: 94ebbe0e58

Change-Id: Iaf24452f3456703c917a2a574ff218c9eac854bd

7 years agodocs: update Paint.setTextSize() to indicate pixel units am: 5f05256106
Mark Lu [Mon, 19 Dec 2016 20:21:26 +0000 (20:21 +0000)]
docs: update Paint.setTextSize() to indicate pixel units am: 5f05256106
am: 9c834b1241

Change-Id: I6ab667b17df3101370ed57f30ab273077a27c346

7 years agodocs: update Paint.setTextSize() to indicate pixel units am: 5f05256106
Mark Lu [Mon, 19 Dec 2016 20:21:21 +0000 (20:21 +0000)]
docs: update Paint.setTextSize() to indicate pixel units am: 5f05256106
am: 9c834b1241

Change-Id: I3288982f953f36ae08a36ca324edb6937633bd18

7 years agodocs: update Paint.setTextSize() to indicate pixel units
Mark Lu [Mon, 19 Dec 2016 20:16:15 +0000 (20:16 +0000)]
docs: update Paint.setTextSize() to indicate pixel units
am: 5f05256106

Change-Id: I9709ea36fe7657c8a06abe1c58760b30112e0e63

7 years agoMerge "docs: remove implicit intent from bindService and startService" into nyc-mr1-dev
Mark Lu [Mon, 19 Dec 2016 20:13:15 +0000 (20:13 +0000)]
Merge "docs: remove implicit intent from bindService and startService" into nyc-mr1-dev

7 years agoMerge "Add UI prompt for MMI code failure on 3gpp" into nyc-mr2-dev
Brad Ebinger [Mon, 19 Dec 2016 19:53:00 +0000 (19:53 +0000)]
Merge "Add UI prompt for MMI code failure on 3gpp" into nyc-mr2-dev

7 years agoRemove "final" from ResultCallback.
Joe LaPenna [Thu, 15 Dec 2016 22:46:52 +0000 (14:46 -0800)]
Remove "final" from ResultCallback.

Removing final makes providers easier to test using mocks.

Test: Build system image.

Change-Id: Iaaa30f73226e1d0cb0e9e68faa349e86986be72d
Merged-In: Iaaa30f73226e1d0cb0e9e68faa349e86986be72d

7 years agoMerge "Merge "Fix OnCancelListener for Dialogs on swipe to dismiss." into cw-f-dev...
Android Build Merger (Role) [Mon, 19 Dec 2016 19:20:12 +0000 (19:20 +0000)]
Merge "Merge "Fix OnCancelListener for Dialogs on swipe to dismiss." into cw-f-dev am: a586b546c3 am: 5109de9bd3" into nyc-mr2-dev-plus-aosp

7 years agoMerge "Merge "Fix OnCancelListener for Dialogs on swipe to dismiss." into cw-f-dev...
Android Build Merger (Role) [Mon, 19 Dec 2016 19:19:31 +0000 (19:19 +0000)]
Merge "Merge "Fix OnCancelListener for Dialogs on swipe to dismiss." into cw-f-dev am: a586b546c3 am: 63fb5ccc17" into nyc-mr2-dev-plus-aosp

7 years agoMerge "Fix OnCancelListener for Dialogs on swipe to dismiss." into cw-f-dev am: a586b...
Charles Mendis [Mon, 19 Dec 2016 19:19:19 +0000 (19:19 +0000)]
Merge "Fix OnCancelListener for Dialogs on swipe to dismiss." into cw-f-dev am: a586b546c3
am: 5109de9bd3

Change-Id: I831ab60727b0d7fa57d379c110f37e2442ba5e5e

7 years agoMerge "Fix OnCancelListener for Dialogs on swipe to dismiss. am: 67639a5f67 am: a2160...
Android Build Merger (Role) [Mon, 19 Dec 2016 19:18:53 +0000 (19:18 +0000)]
Merge "Fix OnCancelListener for Dialogs on swipe to dismiss. am: 67639a5f67 am: a2160c27f9" into nyc-mr2-dev-plus-aosp

7 years agoMerge "Fix OnCancelListener for Dialogs on swipe to dismiss." into cw-f-dev am: a586b...
Charles Mendis [Mon, 19 Dec 2016 19:18:51 +0000 (19:18 +0000)]
Merge "Fix OnCancelListener for Dialogs on swipe to dismiss." into cw-f-dev am: a586b546c3
am: 63fb5ccc17

Change-Id: Ifd33331fddf87c8b9349654aee0c78216a53561d

7 years agoFix OnCancelListener for Dialogs on swipe to dismiss. am: 67639a5f67
Michael Kwan [Mon, 19 Dec 2016 19:17:56 +0000 (19:17 +0000)]
Fix OnCancelListener for Dialogs on swipe to dismiss. am: 67639a5f67
am: a2160c27f9

Change-Id: I4b0ecf9f50e43c7026a52f767af1bc9717626148

7 years agoFix OnCancelListener for Dialogs on swipe to dismiss. am: 67639a5f67
Michael Kwan [Mon, 19 Dec 2016 19:17:48 +0000 (19:17 +0000)]
Fix OnCancelListener for Dialogs on swipe to dismiss. am: 67639a5f67
am: 5a0c0ffd03

Change-Id: Id8faa62cb551424036aae9f542f2d0776cfea522