Commit Graph

301953 Commits

Author SHA1 Message Date
Jeff Sharkey
0be332852e Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr1.5-dev 2016-12-02 18:10:12 +00:00
Jeff Sharkey
8e14278209 Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev 2016-12-02 18:10:11 +00:00
Jeff Sharkey
fdef2cd87d Merge "DO NOT MERGE: Check provider access for content changes." into nyc-dev 2016-12-02 18:10:10 +00:00
Jeff Sharkey
5ec25934ce Merge "DO NOT MERGE: Check provider access for content changes." into nyc-mr1-dev 2016-12-02 18:10:03 +00:00
Robert Sesek
e4ddf44967 Merge "Add new hostingType for startProcessLocked() that selects using the WebViewZygote." am: eda1af611f am: bbcd9d26b1 am: 5806963539
am: 5c44250176

Change-Id: Ia1a819697d7144073f824a98dd8a315eb60c779b
2016-12-02 17:43:56 +00:00
Robert Sesek
5c44250176 Merge "Add new hostingType for startProcessLocked() that selects using the WebViewZygote." am: eda1af611f am: bbcd9d26b1
am: 5806963539

Change-Id: Ic0e53ed482fb27dfab2bb8de52bfe8947beae866
2016-12-02 17:36:21 +00:00
Jean-Michel Trivi
d29d66c787 Merge "Stream types are for volume control" 2016-12-02 17:33:54 +00:00
Colin Cross
4f8d9e69eb Convert libandroidfw to Android.bp
See build/soong/README.md for more information.

Test: libandroidfw_tests
Change-Id: I4e575d62f724d5ffe43f12ff5642fb6799f7819e
2016-12-02 09:33:18 -08:00
Michal Karpinski
c429e71cfe DO NOT MERGE Add connect event reporting
Adds reporting of connect events including netId, destination IP address,
destination port, uid and connect latency.
Currently ignores the new data it receives, further work will be
done in the subsequent CLs.

Test: for now just the benchmarking, in the future CTS

Bug: 29748723

(cherry picked from commit 965894eeb9)

Change-Id: Ic27405cca56fbd99a281b74ac0a8981dc49ec896
2016-12-02 17:24:28 +00:00
Michal Karpinski
70444d3ad5 DO NOT MERGE Extending DNS event reporting
This adds hostname, array of addresses, total count of IP addresses
and uid to the existing pipeline.
Currently ignores the new data it receives, further work will be
done in the subsequent CLs.

Test: for now just the benchmarking, in the future unit and CTS

Bug: 29748723

(cherry picked from commit 14c9d2d0df)

Change-Id: I3941b8d6fc1dd578e2af6ed4d3c3d0a722c39918
2016-12-02 17:21:28 +00:00
Robert Sesek
5806963539 Merge "Add new hostingType for startProcessLocked() that selects using the WebViewZygote." am: eda1af611f
am: bbcd9d26b1

Change-Id: I7b7fbf2cc65712bd748a577c2eee1c0a1e35efee
2016-12-02 17:21:27 +00:00
jackqdyulei
780f574e78 Add tint for location icon
Bug: 32592245
Test: Manual
Change-Id: I2f78a7463053afe6608d478672883097c0798fb3
2016-12-02 09:18:19 -08:00
Robert Sesek
bbcd9d26b1 Merge "Add new hostingType for startProcessLocked() that selects using the WebViewZygote."
am: eda1af611f

Change-Id: I539fb728175c109a93cbff7d8929b584e88bb70c
2016-12-02 17:15:23 +00:00
Treehugger Robot
eda1af611f Merge "Add new hostingType for startProcessLocked() that selects using the WebViewZygote." 2016-12-02 17:02:31 +00:00
Makoto Onuki
5436546589 Merge "ShortcutManager: Floating shortcuts shouldn't have target activities." 2016-12-02 16:34:59 +00:00
Tobias Thierer
9f00d71787 Migrate StrictJarVerifier and ShortcutPackageInfo to java.util.Base64
Previously, they weres using libcore.io.Base64, which is @deprecated.

The two implementations' encoders produce the exact same result.

The two implementations' decoders' behavior differs for malformed
input:
 - In case of error, libcore.io.Base64.decode() returns null while
   java.util.Base64.getDecoder().decode() throws.
 - java.util.Base64 tends to be stricter about rejecting malformed
   input; specifically, it allows neither whitespace nor unexpected
   '=' characters (should only occur in the padding) whereas
   libcore.io.Base64.decode() leniently allows them throughout the
   input.
 - if the input terminates prematurely, libcore.io.Base64 tends to
   return fewer bytes (stops at a four byte boundary).

The behavior differences for malformed Base64 encoded data should
not affect ShortcutPackageInfo because it should only need to deal
with XML attribute values written by itself, which are well-formed.
Note that this CL does not lead to any known changes of the encoding
step, so values written by earlier versions should not cause problems
when read by later versions of ShortcutPackageInfo.

StrictJarVerifier may now reject or behave differently for .jar /
.zip files with malformed attribute values but this seems okay since,
per its name, it is meant to be strict. For example, after this CL,
StrictJarVerifier will no longer accept algorithm + "-Digest"
attribute values with extra whitespace or padding characters as valid.

Test: Confirmed that the two implementations' encoders produce the
      same result by running the following code just before this CL:
      assertEquals(
          libcore.io.Base64.encode(allBytes()),
          Base64.getEncoder().encodeToString(allBytes()));
      where allBytes() returns a byte[] with values (byte) 0 .. (byte) 255
Test: Test that phone still boots after flashing code that includes
      this CL.
Test: CtsLibcoreTestCases

Bug: 31292683

Change-Id: I775d32f329f693514a8f14d87e1ef0d7a757e6c3
2016-12-02 16:20:53 +00:00
Wale Ogunwale
ca9e061256 Allow some app windows to display above the IME.
- Display child windows of the current IME target above the IME.
- Display app windows above the current IME target above the IME.

Regression in the functionality was introduce in
I6f8bf15ba246fac69c4a496ebb1d9e0b9b6a95a2 when we switch away from using
the window list for z-ordering and using the hierarchy which has the IME
above all app windows.

Change-Id: I399aab7fd5ad7327ef6bc29d48f6d9bf48a6ac6c
Fixes: 33128382
Test: bit FrameworksServicesTests:com.android.server.wm.WindowLayersControllerTests
2016-12-02 07:45:59 -08:00
Michael Wright
05c68d3940 Remove accidentally exposed Geofencing classes.
Bug: 33238174
Test: m -j12

Change-Id: I95c3c314f8659f1eeff1dfa218c4c0ab7f0b47b3
2016-12-02 14:45:18 +00:00
Charles He
ad7268724d Merge "Remove IPersistentDataBlockService from system-api." 2016-12-02 14:02:00 +00:00
Jorim Jaggi
bcbe9481ce Fix issue when starting FLAG_DISMISS_KEYGUARD while occluded
Since KS.dismiss comes in before KG.setOccluded, we didn't defer
Keyguard going away until the shade was closed, which lead to
an ugly switch to the normal shade during the dismissal animation.

Test: Start FLAG_DISMISS_KEYGUARD while occluded to show bouncer,
make sure unlock animation is clean.

Test: Open settings from shade while Keyguard is occluded, make
sure animation is clean.

Change-Id: I31bdeb8077570ef2c50759321178f03601f1fa0d
2016-12-02 12:44:03 +00:00
Michal Karpinski
24b7a7d706 Merge "DO NOT MERGE Rename the DnsEventListenerService to NetdEventListenerService" into nyc-mr2-dev am: 3db0a14ab0
am: 9b44cc929f  -s ours

Change-Id: I92bbf99d5fcb12c5b755a80c51a03bee0238aaa1
2016-12-02 12:02:31 +00:00
Narayan Kamath
bea4871fc8 Parcel: Add support for reading/writing lists of Parcelables.
Follows the same marshalling scheme as other list types, such
as lists of Strings etc.

Bug: 30792387
Test: ParcelTest
Change-Id: I2003f4fcf4de5a1bee060f3c2723cfb155105b14
2016-12-02 12:01:12 +00:00
Michal Karpinski
9b44cc929f Merge "DO NOT MERGE Rename the DnsEventListenerService to NetdEventListenerService" into nyc-mr2-dev
am: 3db0a14ab0

Change-Id: I72adcc2aee7f13aa34449ec5ff57e3ab6a62eacc
2016-12-02 11:56:31 +00:00
Michal Karpinski
b32e7e8f14 resolve merge conflicts of 7f9014b to nyc-mr2-dev-plus-aosp
am: 0467529c85

Change-Id: Icb1db24d5e8727efba92badd310095ff803111af
2016-12-02 11:56:00 +00:00
Svetoslav Ganov
b1e2da7c24 Add Bluetooth toggle prompts - framework
If permission review is enabled toggling bluetoth on or off
results in a user prompt to collect consent. This applies
only to legacy apps, i.e. ones that don't support runtime
permissions as they target SDK 22.

Also added a configuration resource which controls whether
permission review mode is enabled. By default it is not and
an OEM can change this via an overlay. For now we also keep
the old mechanism to toggle review mode via a build property
which is still used and will be removed when clients have
transitioned.

bug:28715749

Change-Id: I94c5828ad6c8aa6b363622a26ff9da4fc2e2fac7
2016-12-02 11:52:18 +00:00
Jorim Jaggi
2a66bdb6fb Merge "Don't prepare transition if token is not visible" 2016-12-02 11:46:25 +00:00
Michal Karpinski
0467529c85 resolve merge conflicts of 7f9014b to nyc-mr2-dev-plus-aosp
Change-Id: I9c08147c7a39f3121b5d817c2f498c9ad93066f3
2016-12-02 11:43:02 +00:00
Michal Karpinski
3db0a14ab0 Merge "DO NOT MERGE Rename the DnsEventListenerService to NetdEventListenerService" into nyc-mr2-dev 2016-12-02 09:26:31 +00:00
Jason Long
acdaaea50c Add @Nullable to CompoundButton#setOnCheckedChangeListener().
Test: n/a

Change-Id: I3db93bfcfba528e7271be21356e585e9f9a0799d
2016-12-01 22:56:22 -08:00
NIEJuhu
8708c80cde ExifInterface: fix NegativeArraySizeException
The IFD entry has a 4-byte field COUNT. It is read as int type
and is used as array size by ExifInterface. If a crafted JPEG
file contains a negative value, a NegativeArraySizeException
occurs.

Change-Id: Ief29936400f04636928df09e7f357cbf25345383
Signed-off-by: NIEJuhu <niejuhu@xiaomi.com>
2016-12-02 06:42:58 +00:00
Jack He
f81894f4ae Merge "Protect broadcast emitted by Bluetooth mapmce and pbap profile" am: 7dd909684f am: 33f0cf1267 am: 7ef7e18636
am: 133de5dce0

Change-Id: Id4015a6ff7bfc492181c9e81feadfa66580fbf40
2016-12-02 05:17:12 +00:00
Jack He
133de5dce0 Merge "Protect broadcast emitted by Bluetooth mapmce and pbap profile" am: 7dd909684f am: 33f0cf1267
am: 7ef7e18636

Change-Id: If0b00c67b9f3183669ceca45d23e5a463c283681
2016-12-02 05:10:07 +00:00
Jack He
7ef7e18636 Merge "Protect broadcast emitted by Bluetooth mapmce and pbap profile" am: 7dd909684f
am: 33f0cf1267

Change-Id: I1cb33a340524aeb579330bd49affd02670e89c5a
2016-12-02 04:58:34 +00:00
Jack He
33f0cf1267 Merge "Protect broadcast emitted by Bluetooth mapmce and pbap profile"
am: 7dd909684f

Change-Id: Ib90b23ef7b4271e2adc8a3c66963aaeb5c70a66f
2016-12-02 04:49:39 +00:00
Jordan Liu
35366bec53 Merge "Rename key declaration to start with "KEY"" 2016-12-02 04:46:38 +00:00
Treehugger Robot
7dd909684f Merge "Protect broadcast emitted by Bluetooth mapmce and pbap profile" 2016-12-02 04:37:52 +00:00
Mark Salyzyn
8f42045103 Merge "Merge "Merge "jni: EventLog replace open coding with android_log_event_list" am: 1981812450 am: de04a0480a" into nyc-mr1-dev-plus-aosp am: 8d8cfa2345" into nyc-mr2-dev-plus-aosp
am: 589c9a3fca

Change-Id: Id31b71cfe62b36c741e091c9227c15486b25a5ac
2016-12-02 04:20:52 +00:00
Mark Salyzyn
0a157b9c85 Merge "Merge "jni: EventLog replace open coding with android_log_event_list" am: 1981812450 am: de04a0480a" into nyc-mr1-dev-plus-aosp am: 8d8cfa2345
am: dc13cff108

Change-Id: I9c778ee9e042e44fd3b85aaf3c8ca80576188f0a
2016-12-02 04:20:44 +00:00
Christine Hallstrom
948073cc11 Merge "Merge "Add ability to set supported audio routes on phone accounts and connection" into cw-f-dev am: fd1f724e7a am: e9e77f2603" into nyc-mr2-dev-plus-aosp
am: da0b45e8e5

Change-Id: Idc325f66f9c2251bbdbe5260853d25c157c8d610
2016-12-02 04:19:09 +00:00
Christine Hallstrom
30962ddd75 Merge "Add ability to set supported audio routes on phone accounts and connection" into cw-f-dev am: fd1f724e7a am: e9e77f2603
am: 29059b46e6

Change-Id: I0883125e3f79eb1869b7dd4f47ac69a671dc676a
2016-12-02 04:18:59 +00:00
Mark Salyzyn
d456f91380 Merge "Merge "jni: EventLog replace open coding with android_log_event_list" am: 1981812450 am: de04a0480a am: 0fbd9b7773" into nyc-mr2-dev-plus-aosp
am: 7513beb97f

Change-Id: Ifbb1d18dbe623147bea71aa91caea299dab6d7bd
2016-12-02 04:17:15 +00:00
Mark Salyzyn
fc8601423a Merge "jni: EventLog replace open coding with android_log_event_list" am: 1981812450 am: de04a0480a am: 0fbd9b7773
am: 10585f5c86

Change-Id: I596563bed32c17229213af2b92d6bc03d6073d4c
2016-12-02 04:17:09 +00:00
Christine Hallstrom
345d3c381f Merge "Merge "Merge "Add ability to set supported audio routes on phone accounts and connection" into cw-f-dev am: fd1f724e7a" into nyc-mr1-dev-plus-aosp am: 325e93dfa3" into nyc-mr2-dev-plus-aosp
am: afd2e89fc4

Change-Id: Ie8dca67612016e4583bad7b84cf784fa5ab49cb7
2016-12-02 04:15:32 +00:00
Christine Hallstrom
4bf49a1fd0 Merge "Merge "Add ability to set supported audio routes on phone accounts and connection" into cw-f-dev am: fd1f724e7a" into nyc-mr1-dev-plus-aosp am: 325e93dfa3
am: 599697dcfd

Change-Id: Ief97b2f234b20d2dbbaff1d4f745ef40d5b81180
2016-12-02 04:15:24 +00:00
Christine Hallstrom
8a86eb28bc Merge "Merge "Add ability to set supported audio routes on phone accounts and connection" into cw-f-dev am: fd1f724e7a am: 5599fb3795" into nyc-mr2-dev-plus-aosp
am: 31a1a8e559

Change-Id: I68a116d6c16c67dbd74034e210d51d5de22dc999
2016-12-02 04:13:40 +00:00
Christine Hallstrom
046092adf8 Merge "Add ability to set supported audio routes on phone accounts and connection" into cw-f-dev am: fd1f724e7a am: 5599fb3795
am: 40b42d7925

Change-Id: Ia3e6745a1c0c58f53df3421c725681de4fab29e6
2016-12-02 04:13:31 +00:00
Robert Greenwalt
02c344c5c4 Merge "Merge "Get the correct operator name" am: 297e9f9a32 am: 2232ac8c59 am: 18a0e81a06" into nyc-mr2-dev-plus-aosp
am: c8cdab674d

Change-Id: Ib9f015023960c584c3b09dfbf68454f358660671
2016-12-02 04:09:47 +00:00
Robert Greenwalt
5d90e86cc8 Merge "Get the correct operator name" am: 297e9f9a32 am: 2232ac8c59 am: 18a0e81a06
am: 2f31f105e6

Change-Id: Ibc4d546a7903212444985e256361ec6d870b3684
2016-12-02 04:09:38 +00:00
Christine Hallstrom
a0b3fd8ac6 Merge "Add ability to set supported audio routes on phone accounts and connection am: 4e22d6dc45 am: 9161228e31" into nyc-mr2-dev-plus-aosp
am: c027c8dba8

Change-Id: I673d1ea6063ae546215e8904e0c41f3760473f49
2016-12-02 04:07:25 +00:00
Christine Hallstrom
cc6bc91ea4 Add ability to set supported audio routes on phone accounts and connection am: 4e22d6dc45 am: 9161228e31
am: a30ef94b07

Change-Id: I353e8b542a8250b717fe38b84b622e2e968f2e7e
2016-12-02 04:06:19 +00:00