git.osdn.net Git - android-x86/frameworks-base.git/log

TreeHugger Robot [Wed, 2 Aug 2017 17:14:31 +0000 (17:14 +0000)]

Merge "services.core: remove use of -static hidl java" into oc-dr1-dev-plus-aosp

Merge "Delete dead code function SpotShadow::makeClockwise" am: 8c9e5c81ad am: 98eaf41eec
am: fb3f29b608

Change-Id: I29cbdb6b741f0e4d84a12269607cdd32c6a51a74

Merge "Delete dead code function SpotShadow::makeClockwise" am: 8c9e5c81ad
am: 98eaf41eec

Change-Id: I3760a36d915f495fe8d4e457982440ff61934a6b

Merge "Delete dead code function SpotShadow::makeClockwise"
am: 8c9e5c81ad

Change-Id: I5d696089e13dc68115451c223646ef5e0688b330

commit | commitdiff | tree

Treehugger Robot [Wed, 2 Aug 2017 16:29:23 +0000 (16:29 +0000)]

Merge "Delete dead code function SpotShadow::makeClockwise"

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 2 Aug 2017 16:11:30 +0000 (16:11 +0000)]

Merge "Merge "Clarifies how the autofill service should check for signature hashes." into oc-dev am: c8f0fd7076 am: 6f9f17475d" into oc-dr1-dev-plus-aosp

Merge "Clarifies how the autofill service should check for signature hashes." into oc-dev am: c8f0fd7076
am: 6f9f17475d

Change-Id: Ic1c671be822007e3d0493385e5ceba60f921b607

Merge "Clarifies how the autofill service should check for signature hashes." into oc-dev am: c8f0fd7076
am: 32d4e30778

Change-Id: I5e3eff32fe5224d69bb41c4c4c48b880bc701c4b

Merge "Clarifies how the autofill service should check for signature hashes." into oc-dev
am: c8f0fd7076

Change-Id: Ida9652bb511ea0aa180e649992a9e5fa6409b2be

Merge "Clarifies how the autofill service should check for signature hashes." into oc-dev
am: c8f0fd7076

Change-Id: I3a2419aa6244f01a54211ab60558cc729c29249e

Merge "Clarifies how the autofill service should check for signature hashes." into oc-dev

commit | commitdiff | tree

Steven Moreland [Wed, 2 Aug 2017 15:30:37 +0000 (15:30 +0000)]

Merge "com.android.server: use proper nativehelper headers" into stage-aosp-master am: 7d7c269944
am: 81972a18e4

Change-Id: Id008ba3508c972d8d27eebca22009b4823e387e0

commit | commitdiff | tree

Steven Moreland [Wed, 2 Aug 2017 15:22:09 +0000 (15:22 +0000)]

Merge "com.android.server: use proper nativehelper headers" into stage-aosp-master
am: 7d7c269944

Change-Id: Ie9058f2b554d2d88d31b4bc66ac56d4bf735704d

commit | commitdiff | tree

TreeHugger Robot [Wed, 2 Aug 2017 15:08:37 +0000 (15:08 +0000)]

Merge "com.android.server: use proper nativehelper headers" into stage-aosp-master

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 9ce641fd81 -s ours

Change-Id: I35fdc137ba9f079e4d632d2e62c5aacbb83e9ec4

commit | commitdiff | tree

TreeHugger Robot [Wed, 2 Aug 2017 14:25:24 +0000 (14:25 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev

Merge "Refine condition for starting window skip" into oc-dr1-dev
am: 612de053b8

Change-Id: I9147082d4776b451b487c74785af9df9e2590ca3

Merge "Refine condition for starting window skip" into oc-dr1-dev

Import translations. DO NOT MERGE

Change-Id: I80d58d6708464b7254857c5fca1680bbf4f0212b
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

commit | commitdiff | tree

Jonathan Basseri [Wed, 2 Aug 2017 02:27:55 +0000 (02:27 +0000)]

Merge "Revert "Move getNetworkCountryIso impl from TM to PIM."" am: 85a215bae7 am: 7728849a39
am: 0fed7e3282

Change-Id: If811c7aa40c5be4b0ffcfa5addef8c4b147a1c71

commit | commitdiff | tree

Jonathan Basseri [Wed, 2 Aug 2017 02:06:55 +0000 (02:06 +0000)]

Merge "Revert "Move getNetworkCountryIso impl from TM to PIM."" am: 85a215bae7
am: 7728849a39

Change-Id: Id7f000e7a67c53c8c3d26482a7d1697255943bf7

commit | commitdiff | tree

Jonathan Basseri [Wed, 2 Aug 2017 01:58:18 +0000 (01:58 +0000)]

Merge "Revert "Move getNetworkCountryIso impl from TM to PIM.""
am: 85a215bae7

Change-Id: I30dddd90e5984519219865752f563a45962be593

Merge "Cherry-picked some Autofill Javadoc improvements from " into oc-dev am: 6829a1dace
am: e971d933be

Change-Id: Id05a08413742ef94a426738fd0e82243c0553942

commit | commitdiff | tree

Jonathan Basseri [Wed, 2 Aug 2017 01:51:21 +0000 (01:51 +0000)]

Merge "Move getNetworkCountryIso impl from TM to PIM." am: 58bbef15d8 am: 02cc8151a6
am: aaeca1e977

Change-Id: I9935e8825683fb23fc03e38a93380add8fe4408a

commit | commitdiff | tree

Jonathan Basseri [Wed, 2 Aug 2017 01:44:09 +0000 (01:44 +0000)]

Merge "Revert "Move getNetworkCountryIso impl from TM to PIM.""

commit | commitdiff | tree

Jonathan Basseri [Wed, 2 Aug 2017 01:10:47 +0000 (01:10 +0000)]

Revert "Move getNetworkCountryIso impl from TM to PIM."

This reverts commit 6f4657363cac93ddcc718d9716e3b138f770f2e2.

Change-Id: Ie0062369198af03441c531cd2181ed9c12b8f012

Delete dead code function SpotShadow::makeClockwise

Delete SpotShadow::makeClockwise, which is unused and does
not link when compiler optimizations are disabled (for debugging).
SpotShadow::makeClockwise calls non-existent function
ShadowTessellator::isClockwise, which only works because the
optimizer deletes the function.

Change-Id: Ib8a014bf168782772faa1da7d75a079c1fd28ed9
(cherry picked from commit fdb625a309755fb762c448dd8c2c4e3a7cc26021)

Merge "Cherry-picked some Autofill Javadoc improvements from " into oc-dev am: 6829a1dace
am: 27eb322ed2

Change-Id: Ib78f7d5d690eff9a7b6c424600e1f0a300417b16

Merge "Cherry-picked some Autofill Javadoc improvements from " into oc-dev
am: 6829a1dace

Change-Id: I00eed7ae9679f117296ad1f7162e057720e69aab

Merge "Cherry-picked some Autofill Javadoc improvements from " into oc-dev
am: 6829a1dace

Change-Id: I41dec3cb31e6b523927717950f827f45dadabd8b

commit | commitdiff | tree

TreeHugger Robot [Wed, 2 Aug 2017 00:08:15 +0000 (00:08 +0000)]

Merge "Cherry-picked some Autofill Javadoc improvements from " into oc-dev

commit | commitdiff | tree

Steven Moreland [Tue, 1 Aug 2017 23:34:40 +0000 (16:34 -0700)]

services.core: remove use of -static hidl java

These libraries are being removed. Now, the regular java
library can be used as both a static and non-static library,
we are removing these duplicate libraries which cause
several types problems (such as undefined behavior when
both the static and non-static libs are loaded).

Bug: 36376126
Test: boot marlin device
Change-Id: I6acb6a41fd5c62a3070ada373aed11706c423463

commit | commitdiff | tree

Sundeep Ghuman [Tue, 1 Aug 2017 22:47:04 +0000 (22:47 +0000)]

Merge "Fix broken robotests." into oc-dr1-dev
am: a048e3c03f

Change-Id: I35b3b811fed79b3aafef063df907dddcdc736ecd

commit | commitdiff | tree

Jonathan Basseri [Tue, 1 Aug 2017 22:44:01 +0000 (22:44 +0000)]

Merge "Move getNetworkCountryIso impl from TM to PIM." am: 58bbef15d8
am: 02cc8151a6

Change-Id: Ie3ef6584785cf976cd14fd9143bcf83c20506500

commit | commitdiff | tree

TreeHugger Robot [Tue, 1 Aug 2017 22:38:28 +0000 (22:38 +0000)]

Merge "Fix broken robotests." into oc-dr1-dev

commit | commitdiff | tree

Jonathan Basseri [Tue, 1 Aug 2017 22:34:44 +0000 (22:34 +0000)]

Merge "Move getNetworkCountryIso impl from TM to PIM."
am: 58bbef15d8

Change-Id: I8a97c049b97eca25a03f7cfcbe57eb6729c6741b

commit | commitdiff | tree

Jonathan Basseri [Tue, 1 Aug 2017 22:25:28 +0000 (22:25 +0000)]

Merge "Move getNetworkCountryIso impl from TM to PIM."

commit | commitdiff | tree

Jonathan Basseri [Wed, 19 Jul 2017 20:44:31 +0000 (13:44 -0700)]

Move getNetworkCountryIso impl from TM to PIM.

This moves the implementation of getNetworkCountryIso from
TelephonyManager into PhoneInterfaceManager so that we can perform an
additional IWLAN check.

Bug: 63050313
Test: no compilation errors
Change-Id: I8463af8ed427b73b57a4076c0ff79f055c697657

Merge "Fixed an issue where the statusbar was expanded" into oc-dr1-dev
am: bbd9264c46

Change-Id: I7794e3dc60fb6379b1c3c3c7400be61e45c9a301

commit | commitdiff | tree

TreeHugger Robot [Tue, 1 Aug 2017 21:37:00 +0000 (21:37 +0000)]

Merge "Fixed an issue where the statusbar was expanded" into oc-dr1-dev

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 1 Aug 2017 21:35:01 +0000 (21:35 +0000)]

Merge "Merge "docs: Noted that JobIntentService is usually a better choice" into oc-dev am: d71cc3b72e am: 9e1b7759dc" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Andrew Solovay [Tue, 1 Aug 2017 21:32:05 +0000 (21:32 +0000)]

Merge "docs: Noted that JobIntentService is usually a better choice" into oc-dev am: d71cc3b72e
am: 9e1b7759dc

Change-Id: Ief80079e0cda4aca334f513409c43feae3d34b28

commit | commitdiff | tree

Andrew Solovay [Tue, 1 Aug 2017 21:31:58 +0000 (21:31 +0000)]

Merge "docs: Noted that JobIntentService is usually a better choice" into oc-dev am: d71cc3b72e
am: d4b1a0985b

Change-Id: I18839e2c5c1f64639a7920d64f3271cd2d6dc1a4

commit | commitdiff | tree

Andrew Solovay [Tue, 1 Aug 2017 21:21:58 +0000 (21:21 +0000)]

Merge "docs: Noted that JobIntentService is usually a better choice" into oc-dev
am: d71cc3b72e

Change-Id: I8130d71136078d17196e198db6ff36f7f8489a5c

commit | commitdiff | tree

Andrew Solovay [Tue, 1 Aug 2017 21:21:01 +0000 (21:21 +0000)]

Merge "docs: Noted that JobIntentService is usually a better choice" into oc-dev
am: d71cc3b72e

Change-Id: Ifc47ddab2329814e39022b51510f4264937a3c04

commit | commitdiff | tree

Andrew Solovay [Tue, 1 Aug 2017 21:07:18 +0000 (21:07 +0000)]

Merge "docs: Noted that JobIntentService is usually a better choice" into oc-dev

Merge "Set default value for T3T_PMM." am: 7770adf755 am: 1decea7847
am: e6a08439b6

Change-Id: I80df7df67afa1e9a7dd4071d3005ef2e1ed0c004

Merge "Set default value for T3T_PMM." am: 7770adf755
am: 1decea7847

Change-Id: Ic1548d625c7a3e025af95cd329dd9d4e5f69caef

Merge "Set default value for T3T_PMM."
am: 7770adf755

Change-Id: I31da06276b222d597b3834b4b912f4e0930ee6bc

Merge "Set default value for T3T_PMM."

Merge "Set default value for T3T_PMM." into oc-dr1-dev
am: 756d93964d

Change-Id: If491a922902bc18d282e4c3c3b4a689d78eac897

commit | commitdiff | tree

Steven Moreland [Tue, 1 Aug 2017 17:18:40 +0000 (10:18 -0700)]

com.android.server: use proper nativehelper headers

libnativehelper exports headers under nativehelper. These were
available before incorrectly as global headers in order to give
access to jni.h.

Test: com.android.server finds headers
Bug: 63762847
Change-Id: Icb3018f520004f65e8dd565d6e1d563551548eba

Merge "Revert "Fixing occasional jump when launching certain apps from Recents."" into oc-dr1-dev
am: 0151c395b5

Change-Id: I027d106b11eb23bc056451c65cb89266cfea12e1

Merge "Make it easier to click on phone nav buttons" into oc-dr1-dev
am: 7d08ca6e4d

Change-Id: Id345173efdfb2ceed7449680ad9d9c252fbf8be2

Clarifies how the autofill service should check for signature hashes.

Test: m update-api

Bug: 64125551
Fixes: 63991811

Change-Id: I1ba66787ef91c0fc5fab20b5e9e9fd47aee46412

commit | commitdiff | tree

TreeHugger Robot [Tue, 1 Aug 2017 19:48:12 +0000 (19:48 +0000)]

Merge "Set default value for T3T_PMM." into oc-dr1-dev

Merge "Revert "Fixing occasional jump when launching certain apps from Recents."" into oc-dr1-dev

Merge "Make it easier to click on phone nav buttons" into oc-dr1-dev

commit | commitdiff | tree

Badhri Jagan Sridharan [Tue, 1 Aug 2017 19:03:57 +0000 (19:03 +0000)]

Merge "Reword analog audio not supported notification" into oc-dr1-dev
am: 69840ca338

Change-Id: Id3dc3a226f4830cd7ec748db826283d4889d82e0

Merge "Refresh constants when MCC/MNC changes in PowerUI" into oc-dr1-dev
am: 50d25dc00c

Change-Id: Idfbbe397c5019d4f01502a5ee2ce7a04cd7efdba

commit | commitdiff | tree

TreeHugger Robot [Tue, 1 Aug 2017 18:51:53 +0000 (18:51 +0000)]

Merge "Reword analog audio not supported notification" into oc-dr1-dev

Merge "Refresh constants when MCC/MNC changes in PowerUI" into oc-dr1-dev

Merge "Cleanup QS dialogs" into oc-dr1-dev
am: cb5e0e63b4

Change-Id: Iae6cbee1ff7901bc36f38343e822b99063e8fe57

Merge "Cleanup QS dialogs" into oc-dr1-dev

commit | commitdiff | tree

Alison Cichowlas [Tue, 1 Aug 2017 18:18:49 +0000 (18:18 +0000)]

Merge "Move ShutdownThread calls to system ui thread." into oc-dr1-dev
am: 39a556f1d8

Change-Id: Idd341f7969c40184327428fc27b9f597dab57905

commit | commitdiff | tree

Alison Cichowlas [Tue, 1 Aug 2017 18:06:39 +0000 (18:06 +0000)]

Merge "Move ShutdownThread calls to system ui thread." into oc-dr1-dev

Fixed an issue where the statusbar was expanded

Since we weren't always updating our state whether
our scrims are visible, we could get stuck in an
uninteractable state.

Test: manual, doubletap on AOD notification
Change-Id: I48eca4f29775578382098cf8be876be09ba037a9
Fixes: 64216359

Set default value for T3T_PMM.

If HCEF Application does not provide the T3T PMM value, set the
default value (FFFFFFFFFFFFFFFF) as per NCI specification.

Bug: 64112415
Test: CTS Verifier; HCE-F Reader/Emulator Test
Change-Id: I24f212d9bebd978342e4dd04d618572132e7eb4b
(cherry picked from commit 20a77e973f62f145ab7b3a4822ce34407c0ca476)

Merge "Fix QS wifi scan state" into oc-dr1-dev
am: ce099ba8bc

Change-Id: I314e569a00bf8679739f8e25e8eaa6af76c8c5ce

Merge "Fix QS wifi scan state" into oc-dr1-dev

Make it easier to click on phone nav buttons

When touches fall through the normal click targets, redirect them
to the nearest view.

Test: runtest systemui
Change-Id: I48267d9b1e15bf8dbe8725b72326751b03196efa
Fixes: 64080938

Merge "Fix exceptions causing HTC dongle (and JBL headset) to fail connection logic." into oc-dr1-dev
am: f3562ffdfb

Change-Id: I7af6e0b15e2a09c636a2d540714bfc5dd2d459f9

Merge "Fix exceptions causing HTC dongle (and JBL headset) to fail connection logic." into oc-dr1-dev

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 040c26f636 -s ours

Change-Id: I2ff8751dcedf1648b145a559c0dabce42f944bf0

commit | commitdiff | tree

TreeHugger Robot [Tue, 1 Aug 2017 15:18:52 +0000 (15:18 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 1 Aug 2017 15:18:48 +0000 (15:18 +0000)]

Merge "Merge "power: gps: add gps read timeout" into cw-f-dev am: 33676dddbd am: b5da08a276 am: d88f4b723d am: cd68805540" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 1 Aug 2017 15:17:25 +0000 (15:17 +0000)]

Merge "Merge "power: gps: add gps read timeout" into cw-f-dev am: 33676dddbd am: b5da08a276 am: d88f4b723d am: 5e76d54639" into oc-dr1-dev-plus-aosp

Merge "power: gps: add gps read timeout" into cw-f-dev am: 33676dddbd am: b5da08a276 am: d88f4b723d
am: cd68805540

Change-Id: Iaf585d7d9489cc35b834b6907232ad9dd3185ec7

Merge "power: gps: add gps read timeout" into cw-f-dev am: 33676dddbd am: b5da08a276 am: d88f4b723d
am: 5e76d54639

Change-Id: Ia8c8aa458f3b8e57eaa7253fe87bad1efe5e23c9

commit | commitdiff | tree

Andriy Naborskyy [Tue, 1 Aug 2017 15:13:27 +0000 (15:13 +0000)]

Merge changes I49a76582,Iac4b75bc into cw-f-dev am: f18599a15b am: 9295f58d26 am: 502986f72a
am: 5223106231

Change-Id: I87ec29fb8b0ec5f61841b0596f0628d1e6cb0c71

DO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler am: 456b91561d -s ours am: ff55799950 -s ours am: 17e2448c26 -s ours
am: 0dbabf02f2 -s ours

Change-Id: Ie1a18b001d85450f6458f33b75b0f2f3965a81a9

commit | commitdiff | tree

Andriy Naborskyy [Tue, 1 Aug 2017 15:04:35 +0000 (15:04 +0000)]

Merge changes I49a76582,Iac4b75bc into cw-f-dev am: f18599a15b am: 9295f58d26 am: 502986f72a
am: 257910c493

Change-Id: I413cdc0d2075cbad6f5409318ad58e394733a5e3

Merge "power: gps: add gps read timeout" into cw-f-dev am: 33676dddbd am: b5da08a276
am: d88f4b723d

Change-Id: I63d677df2353fff2d2e786e25b0dc416837f1581

DO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler am: 456b91561d -s ours am: ff55799950 -s ours am: 17e2448c26 -s ours
am: 7cf8e71e33 -s ours

Change-Id: Idf2184eb808068366384031694c7fa89fe49c8bb

Merge "power: gps: add gps read timeout" into cw-f-dev am: 33676dddbd am: b5da08a276
am: d88f4b723d

Change-Id: I538ec037d1eb1b2ef8970d527a2d9aa53fd7fad8

commit | commitdiff | tree

Andriy Naborskyy [Tue, 1 Aug 2017 14:56:23 +0000 (14:56 +0000)]

Merge changes I49a76582,Iac4b75bc into cw-f-dev am: f18599a15b am: 9295f58d26
am: 502986f72a

Change-Id: Ic615cfdefcf6a226c868e9203e74070e9000a931

DO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler am: 456b91561d -s ours am: ff55799950 -s ours
am: 17e2448c26 -s ours

Change-Id: Ia38655a26410e9ea78e394e5c59e052739f041a6

commit | commitdiff | tree

Andriy Naborskyy [Tue, 1 Aug 2017 14:52:13 +0000 (14:52 +0000)]

Merge changes I49a76582,Iac4b75bc into cw-f-dev am: f18599a15b am: 9295f58d26
am: 502986f72a

Change-Id: Idae1def3c8dc80d7f5e3cd83438553cf099541a7

DO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler am: 456b91561d -s ours am: ff55799950 -s ours
am: 17e2448c26 -s ours

Change-Id: Idc2217a66f60caa783957fd6caeaafa1ff1615bc

Merge "power: gps: add gps read timeout" into cw-f-dev am: 33676dddbd
am: b5da08a276

Change-Id: I5d96dd73affe79880583347e32a95be8510a5462

Cleanup QS dialogs

Test: manual
Change-Id: I3a87b171d9000ac6628f3d83fc2a817136dc3010
Fixes: 64159285
Fixes: 64158814

commit | commitdiff | tree

Andriy Naborskyy [Tue, 1 Aug 2017 14:38:26 +0000 (14:38 +0000)]

Merge changes I49a76582,Iac4b75bc into cw-f-dev am: f18599a15b
am: 9295f58d26

Change-Id: Ifd70690f5e275e89d59a15134427e2bcc91e67c7

Merge "power: gps: add gps read timeout" into cw-f-dev
am: 33676dddbd

Change-Id: I7e3a779631c2de4a14521c8dac6d5b2d96ce1b29

DO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler am: 456b91561d -s ours
am: ff55799950 -s ours

Change-Id: I6d788c5b7cd5c6877799e5a3e0ad865996147b70

Merge "power: gps: add gps read timeout" into cw-f-dev

commit | commitdiff | tree

Andriy Naborskyy [Tue, 1 Aug 2017 14:30:05 +0000 (14:30 +0000)]

Merge changes I49a76582,Iac4b75bc into cw-f-dev
am: f18599a15b

Change-Id: Ib1f6b94a4970bbec28d6bbc7de8969c9d5d3975f

DO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler
am: 456b91561d -s ours

Change-Id: Ie54e0712dc83514ff3ddcd6cee1b0bd2e80c73ad

commit | commitdiff | tree

Andriy Naborskyy [Tue, 1 Aug 2017 14:16:30 +0000 (14:16 +0000)]

Merge changes I49a76582,Iac4b75bc into cw-f-dev

* changes:
DO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler
DO NOT MERGE ANYWHERE ConnectivityService: safer locking

Fix QS wifi scan state

Test: manual
Change-Id: Icc4e627f1248b5749801ad532220b3b9fade036d
Fixes: 63648257