OSDN Git Service

android-x86/frameworks-base.git
7 years agoMerge "Fix race condition when destroying view" into oc-dr1-dev am: b0e5b53bbf
Lucas Dupin [Wed, 2 Aug 2017 18:12:06 +0000 (18:12 +0000)]
Merge "Fix race condition when destroying view" into oc-dr1-dev am: b0e5b53bbf
am: aa65f36ffb

Change-Id: I197d45d0a274a68a17a3c8d83880d0a75a3b5456

7 years agoMerge "Fix race condition when destroying view" into oc-dr1-dev
Lucas Dupin [Wed, 2 Aug 2017 18:03:21 +0000 (18:03 +0000)]
Merge "Fix race condition when destroying view" into oc-dr1-dev
am: b0e5b53bbf

Change-Id: I6e07dca79e8d33522d4f0e9b58dcc48bdff555d2

7 years agoMerge "Always report a uid's initial cached state." into oc-mr1-dev
Dianne Hackborn [Wed, 2 Aug 2017 18:02:12 +0000 (18:02 +0000)]
Merge "Always report a uid's initial cached state." into oc-mr1-dev
am: c134dec17f

Change-Id: I5a981e0483a723be7d8fdc22d9b052a97dbb422d

7 years agoMerge "Improve docs about exceptions through Binder." into oc-mr1-dev
Dianne Hackborn [Wed, 2 Aug 2017 17:59:17 +0000 (17:59 +0000)]
Merge "Improve docs about exceptions through Binder." into oc-mr1-dev
am: 6e3af279ab

Change-Id: Ia69e8ed7db5210284fbfea95be2a2b0a7c6e3052

7 years agoMerge "Always report a uid's initial cached state." into oc-mr1-dev
TreeHugger Robot [Wed, 2 Aug 2017 17:51:48 +0000 (17:51 +0000)]
Merge "Always report a uid's initial cached state." into oc-mr1-dev

7 years agoMerge "Add owners for the network security config" am: 8773730cd9 am: e9d50c793a...
Chad Brubaker [Wed, 2 Aug 2017 17:51:46 +0000 (17:51 +0000)]
Merge "Add owners for the network security config" am: 8773730cd9 am: e9d50c793a am: 531f1af615
am: 5813bc2b22

Change-Id: I649c914986c16b5594219425a391c03e0a9b4390

7 years agoMerge "Improve docs about exceptions through Binder." into oc-mr1-dev
Dianne Hackborn [Wed, 2 Aug 2017 17:51:01 +0000 (17:51 +0000)]
Merge "Improve docs about exceptions through Binder." into oc-mr1-dev

7 years agoMerge "Fix race condition when destroying view" into oc-dr1-dev
TreeHugger Robot [Wed, 2 Aug 2017 17:47:59 +0000 (17:47 +0000)]
Merge "Fix race condition when destroying view" into oc-dr1-dev

7 years agoMerge "LightStatus: Fix notification icon color filter" into oc-dr1-dev am: 6134b7529b
Adrian Roos [Wed, 2 Aug 2017 17:45:13 +0000 (17:45 +0000)]
Merge "LightStatus: Fix notification icon color filter" into oc-dr1-dev am: 6134b7529b
am: f4a92fa5ce

Change-Id: Ide9bc1a3b8dae01db77b1faf3c2a05b7f3548aec

7 years agoMerge "Fixed an issue where icons were jumping" into oc-dr1-dev am: 7a719ab0ed
Selim Cinek [Wed, 2 Aug 2017 17:42:21 +0000 (17:42 +0000)]
Merge "Fixed an issue where icons were jumping" into oc-dr1-dev am: 7a719ab0ed
am: db6902f7ff

Change-Id: Id639f01a3969851294bfcd6746b84bac579da0f7

7 years agoMerge "Add owners for the network security config" am: 8773730cd9 am: e9d50c793a
Chad Brubaker [Wed, 2 Aug 2017 17:41:21 +0000 (17:41 +0000)]
Merge "Add owners for the network security config" am: 8773730cd9 am: e9d50c793a
am: 531f1af615

Change-Id: I77240a60f796c63acd640b8a43cb7054ad2a8bee

7 years agoMerge "LightStatus: Fix notification icon color filter" into oc-dr1-dev am: 6134b7529b
Adrian Roos [Wed, 2 Aug 2017 17:38:02 +0000 (17:38 +0000)]
Merge "LightStatus: Fix notification icon color filter" into oc-dr1-dev am: 6134b7529b
am: c1c890d7fa

Change-Id: Ib387e9a44e78c7344b6c3efca01302c4aa77483a

7 years agoMerge "Fixed an issue where icons were jumping" into oc-dr1-dev am: 7a719ab0ed
Selim Cinek [Wed, 2 Aug 2017 17:36:03 +0000 (17:36 +0000)]
Merge "Fixed an issue where icons were jumping" into oc-dr1-dev am: 7a719ab0ed
am: 83aa001adf

Change-Id: Id8399a6fed722da7057c21e23981bc6925d72e7d

7 years agoMerge "Merge "Merge "Add hwbinder library" am: 49e2a9a612 am: 811027ede7 am: 2785be75...
Android Build Merger (Role) [Wed, 2 Aug 2017 17:32:08 +0000 (17:32 +0000)]
Merge "Merge "Merge "Add hwbinder library" am: 49e2a9a612 am: 811027ede7 am: 2785be7572" into oc-dr1-dev-plus-aosp am: a4fb234a4c" into oc-mr1-dev-plus-aosp

7 years agoMerge "LightStatus: Fix notification icon color filter" into oc-dr1-dev
Adrian Roos [Wed, 2 Aug 2017 17:31:17 +0000 (17:31 +0000)]
Merge "LightStatus: Fix notification icon color filter" into oc-dr1-dev
am: 6134b7529b

Change-Id: I0f6b682d53f764c93d1c1c48490cf1427857b1b4

7 years agoMerge "LightStatus: Fix notification icon color filter" into oc-dr1-dev
Adrian Roos [Wed, 2 Aug 2017 17:30:33 +0000 (17:30 +0000)]
Merge "LightStatus: Fix notification icon color filter" into oc-dr1-dev
am: 6134b7529b

Change-Id: Ib68dcc833b2a25466b147e8c406fa6bbd8517e02

7 years agoMerge "View: fix setTransientState" into oc-mr1-dev
Dake Gu [Wed, 2 Aug 2017 17:27:53 +0000 (17:27 +0000)]
Merge "View: fix setTransientState" into oc-mr1-dev
am: 8eb3a3979f

Change-Id: I85950ec6275c2d10bd0e9b7f030fa5ce2c66130c

7 years agoMerge "Add owners for the network security config" am: 8773730cd9
Chad Brubaker [Wed, 2 Aug 2017 17:27:51 +0000 (17:27 +0000)]
Merge "Add owners for the network security config" am: 8773730cd9
am: e9d50c793a

Change-Id: Id183ac68171c94d082c992bd3e986c136d6c7764

7 years agoMerge "Fixed an issue where icons were jumping" into oc-dr1-dev
Selim Cinek [Wed, 2 Aug 2017 17:27:48 +0000 (17:27 +0000)]
Merge "Fixed an issue where icons were jumping" into oc-dr1-dev
am: 7a719ab0ed

Change-Id: I5e983a7275e1dc117c1c70d6ae7be14b121d5c54

7 years agoMerge "Fixed an issue where icons were jumping" into oc-dr1-dev
Selim Cinek [Wed, 2 Aug 2017 17:27:46 +0000 (17:27 +0000)]
Merge "Fixed an issue where icons were jumping" into oc-dr1-dev
am: 7a719ab0ed

Change-Id: I145e868610a92ba1af501c62b151c7f55663bec3

7 years agoMerge "Merge "Add hwbinder library" am: 49e2a9a612 am: 811027ede7 am: 2785be7572...
Sundong Ahn [Wed, 2 Aug 2017 17:27:38 +0000 (17:27 +0000)]
Merge "Merge "Add hwbinder library" am: 49e2a9a612 am: 811027ede7 am: 2785be7572" into oc-dr1-dev-plus-aosp
am: a4fb234a4c

Change-Id: I026ca8c33ef2fce7d40e2daec8db970d6b578f25

7 years agoMerge "services.core: remove use of -static hidl java" into oc-dr1-dev-plus-aosp
Steven Moreland [Wed, 2 Aug 2017 17:23:53 +0000 (17:23 +0000)]
Merge "services.core: remove use of -static hidl java" into oc-dr1-dev-plus-aosp
am: 3750937e70

Change-Id: I58257cf8a3f97ffec4cfef3a58ab8b87194295ea

7 years agoMerge "LightStatus: Fix notification icon color filter" into oc-dr1-dev
Adrian Roos [Wed, 2 Aug 2017 17:23:31 +0000 (17:23 +0000)]
Merge "LightStatus: Fix notification icon color filter" into oc-dr1-dev

7 years agoMerge "Add owners for the network security config"
Chad Brubaker [Wed, 2 Aug 2017 17:20:16 +0000 (17:20 +0000)]
Merge "Add owners for the network security config"
am: 8773730cd9

Change-Id: I18b8aac4c1ac85bde3e6735e1afe6375f5c0e177

7 years agoMerge "View: fix setTransientState" into oc-mr1-dev
Dake Gu [Wed, 2 Aug 2017 17:18:00 +0000 (17:18 +0000)]
Merge "View: fix setTransientState" into oc-mr1-dev

7 years agoMerge "Merge "Add hwbinder library" am: 49e2a9a612 am: 811027ede7 am: 2785be7572...
Android Build Merger (Role) [Wed, 2 Aug 2017 17:16:57 +0000 (17:16 +0000)]
Merge "Merge "Add hwbinder library" am: 49e2a9a612 am: 811027ede7 am: 2785be7572" into oc-dr1-dev-plus-aosp

7 years agoMerge "Fixed an issue where icons were jumping" into oc-dr1-dev
TreeHugger Robot [Wed, 2 Aug 2017 17:16:18 +0000 (17:16 +0000)]
Merge "Fixed an issue where icons were jumping" into oc-dr1-dev

7 years agoMerge "Add hwbinder library" am: 49e2a9a612 am: 811027ede7
Sundong Ahn [Wed, 2 Aug 2017 17:14:55 +0000 (17:14 +0000)]
Merge "Add hwbinder library" am: 49e2a9a612 am: 811027ede7
am: 2785be7572

Change-Id: Ia545b163166465cafa3d4ecbb0a5d0d911224b22

7 years agoMerge "services.core: remove use of -static hidl java" into oc-dr1-dev-plus-aosp
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

7 years agoMerge "Delete dead code function SpotShadow::makeClockwise" am: 8c9e5c81ad am: 98eaf4...
Stan Iliev [Wed, 2 Aug 2017 17:10:57 +0000 (17:10 +0000)]
Merge "Delete dead code function SpotShadow::makeClockwise" am: 8c9e5c81ad am: 98eaf41eec am: fb3f29b608
am: ccd3121379

Change-Id: I4f96e688549840198dee57cd85c4362d23e564d8

7 years agoMerge "Add owners for the network security config"
Treehugger Robot [Wed, 2 Aug 2017 17:10:11 +0000 (17:10 +0000)]
Merge "Add owners for the network security config"

7 years agoMerge "Add hwbinder library" am: 49e2a9a612
Sundong Ahn [Wed, 2 Aug 2017 17:05:56 +0000 (17:05 +0000)]
Merge "Add hwbinder library" am: 49e2a9a612
am: 811027ede7

Change-Id: Idec0d080a65d96ff866969f47e9902e40e800fdf

7 years agoMerge "Delete dead code function SpotShadow::makeClockwise" am: 8c9e5c81ad am: 98eaf41eec
Stan Iliev [Wed, 2 Aug 2017 17:01:17 +0000 (17:01 +0000)]
Merge "Delete dead code function SpotShadow::makeClockwise" am: 8c9e5c81ad am: 98eaf41eec
am: fb3f29b608

Change-Id: I29cbdb6b741f0e4d84a12269607cdd32c6a51a74

7 years agoMerge "Add hwbinder library"
Sundong Ahn [Wed, 2 Aug 2017 16:57:50 +0000 (16:57 +0000)]
Merge "Add hwbinder library"
am: 49e2a9a612

Change-Id: I3c7528dcf98bf3b92843594172531fd30a5f29d4

7 years agoMerge "Delete dead code function SpotShadow::makeClockwise" am: 8c9e5c81ad
Stan Iliev [Wed, 2 Aug 2017 16:52:20 +0000 (16:52 +0000)]
Merge "Delete dead code function SpotShadow::makeClockwise" am: 8c9e5c81ad
am: 98eaf41eec

Change-Id: I3760a36d915f495fe8d4e457982440ff61934a6b

7 years agoMerge "Add hwbinder library"
Treehugger Robot [Wed, 2 Aug 2017 16:46:42 +0000 (16:46 +0000)]
Merge "Add hwbinder library"

7 years agoMerge "Delete dead code function SpotShadow::makeClockwise"
Stan Iliev [Wed, 2 Aug 2017 16:44:22 +0000 (16:44 +0000)]
Merge "Delete dead code function SpotShadow::makeClockwise"
am: 8c9e5c81ad

Change-Id: I5d696089e13dc68115451c223646ef5e0688b330

7 years agoMerge "Delete dead code function SpotShadow::makeClockwise"
Treehugger Robot [Wed, 2 Aug 2017 16:29:23 +0000 (16:29 +0000)]
Merge "Delete dead code function SpotShadow::makeClockwise"

7 years agoMerge "Merge "Merge "Clarifies how the autofill service should check for signature...
Android Build Merger (Role) [Wed, 2 Aug 2017 16:22:16 +0000 (16:22 +0000)]
Merge "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 am: e3e338ed08" into oc-mr1-dev-plus-aosp

7 years agoMerge "Merge "Clarifies how the autofill service should check for signature hashes...
Felipe Leme [Wed, 2 Aug 2017 16:20:40 +0000 (16:20 +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
am: e3e338ed08

Change-Id: Id8f0b1623ed9b268d3cd45521a5e9965b8e3feeb

7 years agoMerge "Merge "Clarifies how the autofill service should check for signature hashes...
Android Build Merger (Role) [Wed, 2 Aug 2017 16:20:03 +0000 (16:20 +0000)]
Merge "Merge "Clarifies how the autofill service should check for signature hashes." into oc-dev am: c8f0fd7076 am: 32d4e30778 am: 23123ece60" into oc-mr1-dev-plus-aosp

7 years agoMerge "Clarifies how the autofill service should check for signature hashes." into...
Felipe Leme [Wed, 2 Aug 2017 16:17:40 +0000 (16:17 +0000)]
Merge "Clarifies how the autofill service should check for signature hashes." into oc-dev am: c8f0fd7076 am: 32d4e30778
am: 23123ece60

Change-Id: I57fc9c13849c9e8ed8960fddbac888a19ad40924

7 years agoMerge "Clarifies how the autofill service should check for signature hashes." into...
Felipe Leme [Wed, 2 Aug 2017 16:17:39 +0000 (16:17 +0000)]
Merge "Clarifies how the autofill service should check for signature hashes." into oc-dev am: c8f0fd7076 am: 32d4e30778
am: d25050e2a4

Change-Id: I46463fe043ce8e008a4587bba80c2a48c029fed9

7 years agoMerge "Merge "Clarifies how the autofill service should check for signature hashes...
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

7 years agoMerge "Clarifies how the autofill service should check for signature hashes." into...
Felipe Leme [Wed, 2 Aug 2017 16:09:58 +0000 (16:09 +0000)]
Merge "Clarifies how the autofill service should check for signature hashes." into oc-dev am: c8f0fd7076
am: 6f9f17475d

Change-Id: Ic1c671be822007e3d0493385e5ceba60f921b607

7 years agoMerge "Clarifies how the autofill service should check for signature hashes." into...
Felipe Leme [Wed, 2 Aug 2017 16:09:20 +0000 (16:09 +0000)]
Merge "Clarifies how the autofill service should check for signature hashes." into oc-dev am: c8f0fd7076
am: 32d4e30778

Change-Id: I5e3eff32fe5224d69bb41c4c4c48b880bc701c4b

7 years agoMerge "Clarifies how the autofill service should check for signature hashes." into...
Felipe Leme [Wed, 2 Aug 2017 16:09:13 +0000 (16:09 +0000)]
Merge "Clarifies how the autofill service should check for signature hashes." into oc-dev am: c8f0fd7076
am: 32d4e30778

Change-Id: I8de50b81273e89298a6276d8b17100c90361380e

7 years agoMerge "Clarifies how the autofill service should check for signature hashes." into...
Felipe Leme [Wed, 2 Aug 2017 16:00:41 +0000 (16:00 +0000)]
Merge "Clarifies how the autofill service should check for signature hashes." into oc-dev
am: c8f0fd7076

Change-Id: Ida9652bb511ea0aa180e649992a9e5fa6409b2be

7 years agoMerge "Clarifies how the autofill service should check for signature hashes." into...
Felipe Leme [Wed, 2 Aug 2017 16:00:39 +0000 (16:00 +0000)]
Merge "Clarifies how the autofill service should check for signature hashes." into oc-dev
am: c8f0fd7076

Change-Id: I3a2419aa6244f01a54211ab60558cc729c29249e

7 years agoMerge "Clarifies how the autofill service should check for signature hashes." into...
Felipe Leme [Wed, 2 Aug 2017 15:52:05 +0000 (15:52 +0000)]
Merge "Clarifies how the autofill service should check for signature hashes." into oc-dev

7 years agoMerge "com.android.server: use proper nativehelper headers" into stage-aosp-master...
Steven Moreland [Wed, 2 Aug 2017 15:38:40 +0000 (15:38 +0000)]
Merge "com.android.server: use proper nativehelper headers" into stage-aosp-master am: 7d7c269944 am: 81972a18e4
am: 795bcc5b75

Change-Id: I6ef4e3b5c44272f5f0a8d585afea15a901178d2a

7 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Wed, 2 Aug 2017 15:30:44 +0000 (15:30 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: e5ae77c679  -s ours

Change-Id: I40363a8dfa67eeb76bcef16a239a753582e94edd

7 years agoMerge "com.android.server: use proper nativehelper headers" into stage-aosp-master...
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

7 years agoMerge "com.android.server: use proper nativehelper headers" into stage-aosp-master
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

7 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Wed, 2 Aug 2017 15:20:57 +0000 (15:20 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

7 years agoMerge "Fix deadlock between AMS and EphemeralResolverConnection" into oc-mr1-dev
Todd Kennedy [Wed, 2 Aug 2017 15:16:23 +0000 (15:16 +0000)]
Merge "Fix deadlock between AMS and EphemeralResolverConnection" into oc-mr1-dev
am: a3735dc42e

Change-Id: I9698b051ffd874692476419bfd7a4bb115ec6ef7

7 years agoMerge "com.android.server: use proper nativehelper headers" into stage-aosp-master
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

7 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Wed, 2 Aug 2017 15:04:55 +0000 (15:04 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: 9f38e0f5e7  -s ours

Change-Id: I63a334e79ffeff50a02e1a428cfa8b9c6ceae4fa

7 years agoMerge "Fix deadlock between AMS and EphemeralResolverConnection" into oc-mr1-dev
Todd Kennedy [Wed, 2 Aug 2017 14:59:19 +0000 (14:59 +0000)]
Merge "Fix deadlock between AMS and EphemeralResolverConnection" into oc-mr1-dev

7 years agoLightStatus: Fix notification icon color filter
Adrian Roos [Wed, 2 Aug 2017 14:57:11 +0000 (16:57 +0200)]
LightStatus: Fix notification icon color filter

Fixes an issue with the color filter applied to status bar icons where the
tint's alpha channel was ignored.

Change-Id: Idf22c70524fb718995d09ef339b825425ca5f7a7
Fixes: 64139391
Test: Look at light status bar with notifications; verify that icons have slightly gray tint instead of fully black

7 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Wed, 2 Aug 2017 14:49:10 +0000 (14:49 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

7 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 9ce641fd81 -s ours
Bill Yi [Wed, 2 Aug 2017 14:46:00 +0000 (14:46 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 9ce641fd81  -s ours
am: 5a4b06803d  -s ours

Change-Id: I00ea5acfa526d81275424043bccb3455fd0d0d1b

7 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 9ce641fd81 -s ours
Bill Yi [Wed, 2 Aug 2017 14:41:02 +0000 (14:41 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 9ce641fd81  -s ours
am: 0c411c32cd  -s ours

Change-Id: Icb98d17a57ee254b3a5d3df7b4eee7332e14c35f

7 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Wed, 2 Aug 2017 14:36:03 +0000 (14:36 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 9ce641fd81  -s ours

Change-Id: I35fdc137ba9f079e4d632d2e62c5aacbb83e9ec4

7 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Wed, 2 Aug 2017 14:35:59 +0000 (14:35 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 9ce641fd81  -s ours

Change-Id: I1dff9545bf7cc357ef8d3bac8954d59c0c23b5c4

7 years agoMerge "Add new API to retrieve app names in a batch" into oc-mr1-dev
Todd Kennedy [Wed, 2 Aug 2017 14:33:09 +0000 (14:33 +0000)]
Merge "Add new API to retrieve app names in a batch" into oc-mr1-dev
am: 5e049eb884

Change-Id: I27542404b197a9d11d611d95f271660856271d40

7 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Wed, 2 Aug 2017 14:25:24 +0000 (14:25 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev

7 years agoMerge "Add new API to retrieve app names in a batch" into oc-mr1-dev
Todd Kennedy [Wed, 2 Aug 2017 14:23:16 +0000 (14:23 +0000)]
Merge "Add new API to retrieve app names in a batch" into oc-mr1-dev

7 years agoMerge "Merge "Refine condition for starting window skip" into oc-dr1-dev am: 612de053...
Android Build Merger (Role) [Wed, 2 Aug 2017 12:34:29 +0000 (12:34 +0000)]
Merge "Merge "Refine condition for starting window skip" into oc-dr1-dev am: 612de053b8 am: cf538b382a" into oc-mr1-dev-plus-aosp

7 years agoMerge "Refine condition for starting window skip" into oc-dr1-dev am: 612de053b8
Jorim Jaggi [Wed, 2 Aug 2017 12:32:27 +0000 (12:32 +0000)]
Merge "Refine condition for starting window skip" into oc-dr1-dev am: 612de053b8
am: cf538b382a

Change-Id: Ia7c5f062b34475630817fefe5fc7ab68f4e0cdaf

7 years agoMerge "Refine condition for starting window skip" into oc-dr1-dev am: 612de053b8
Jorim Jaggi [Wed, 2 Aug 2017 12:32:24 +0000 (12:32 +0000)]
Merge "Refine condition for starting window skip" into oc-dr1-dev am: 612de053b8
am: 7269de217e

Change-Id: I1b5517489afa3da6c767bea99122a7c7fa05c3a1

7 years agoMerge "Refine condition for starting window skip" into oc-dr1-dev
Jorim Jaggi [Wed, 2 Aug 2017 12:23:06 +0000 (12:23 +0000)]
Merge "Refine condition for starting window skip" into oc-dr1-dev
am: 612de053b8

Change-Id: I9147082d4776b451b487c74785af9df9e2590ca3

7 years agoMerge "Refine condition for starting window skip" into oc-dr1-dev
Jorim Jaggi [Wed, 2 Aug 2017 12:22:58 +0000 (12:22 +0000)]
Merge "Refine condition for starting window skip" into oc-dr1-dev
am: 612de053b8

Change-Id: I687dad0a2177c8235e0a2acfd574a92a2a5cd6bb

7 years agoMerge "Refine condition for starting window skip" into oc-dr1-dev
Jorim Jaggi [Wed, 2 Aug 2017 12:15:40 +0000 (12:15 +0000)]
Merge "Refine condition for starting window skip" into oc-dr1-dev

7 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 2 Aug 2017 07:57:25 +0000 (00:57 -0700)]
Import translations. DO NOT MERGE

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

7 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 2 Aug 2017 07:37:29 +0000 (00:37 -0700)]
Import translations. DO NOT MERGE

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

7 years agoMerge "Show correct security type for PasspointConfiguration" into oc-mr1-dev
Tomoharu Hatano [Wed, 2 Aug 2017 06:08:07 +0000 (06:08 +0000)]
Merge "Show correct security type for PasspointConfiguration" into oc-mr1-dev
am: 5af90f9fc6

Change-Id: I1cb9fabb9d3308312962305b6eb5d22314eb49a5

7 years agoMerge "Show correct security type for PasspointConfiguration" into oc-mr1-dev
TreeHugger Robot [Wed, 2 Aug 2017 06:01:04 +0000 (06:01 +0000)]
Merge "Show correct security type for PasspointConfiguration" into oc-mr1-dev

7 years agoMerge "Revert "Move getNetworkCountryIso impl from TM to PIM."" am: 85a215bae7 am...
Jonathan Basseri [Wed, 2 Aug 2017 02:37:46 +0000 (02:37 +0000)]
Merge "Revert "Move getNetworkCountryIso impl from TM to PIM."" am: 85a215bae7 am: 7728849a39 am: 0fed7e3282
am: 96bfbcdcd4

Change-Id: I918dc3e55ca50416d6a92341e1f8b8eef33415fd

7 years agoMerge "Revert "Move getNetworkCountryIso impl from TM to PIM."" am: 85a215bae7 am...
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

7 years agoMerge "Cherry-picked some Autofill Javadoc improvements from master." into oc-dev...
Felipe Leme [Wed, 2 Aug 2017 02:10:35 +0000 (02:10 +0000)]
Merge "Cherry-picked some Autofill Javadoc improvements from " into oc-dev am: 6829a1dace am: e971d933be
am: 35120d33fe  -s ours

Change-Id: I3a921cd3ad150516480c181e305edeb0747ac922

7 years agoMerge "Move getNetworkCountryIso impl from TM to PIM." am: 58bbef15d8 am: 02cc8151a6...
Jonathan Basseri [Wed, 2 Aug 2017 02:07:20 +0000 (02:07 +0000)]
Merge "Move getNetworkCountryIso impl from TM to PIM." am: 58bbef15d8 am: 02cc8151a6 am: aaeca1e977
am: 89a2a41572

Change-Id: I55d117ed2e61cd54b9e64034b0e5df8be00ce9e6

7 years agoMerge "Revert "Move getNetworkCountryIso impl from TM to PIM."" am: 85a215bae7
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

7 years agoMerge "Revert "Move getNetworkCountryIso impl from TM to PIM.""
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

7 years agoMerge "Cherry-picked some Autofill Javadoc improvements from master." into oc-dev...
Felipe Leme [Wed, 2 Aug 2017 01:57:16 +0000 (01:57 +0000)]
Merge "Cherry-picked some Autofill Javadoc improvements from " into oc-dev am: 6829a1dace
am: e971d933be

Change-Id: Id05a08413742ef94a426738fd0e82243c0553942

7 years agoMerge "Move getNetworkCountryIso impl from TM to PIM." am: 58bbef15d8 am: 02cc8151a6
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

7 years agoMerge "Revert "Move getNetworkCountryIso impl from TM to PIM.""
Jonathan Basseri [Wed, 2 Aug 2017 01:44:09 +0000 (01:44 +0000)]
Merge "Revert "Move getNetworkCountryIso impl from TM to PIM.""

7 years agoRevert "Move getNetworkCountryIso impl from TM to PIM."
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

7 years agoDelete dead code function SpotShadow::makeClockwise
Stan Iliev [Wed, 27 Jul 2016 22:08:06 +0000 (18:08 -0400)]
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)

7 years agoMerge "Merge "Cherry-picked some Autofill Javadoc improvements from master." into...
Felipe Leme [Wed, 2 Aug 2017 01:00:22 +0000 (01:00 +0000)]
Merge "Merge "Cherry-picked some Autofill Javadoc improvements from " into oc-dev am: 6829a1dace am: 27eb322ed2  -s ours" into oc-mr1-dev
am: 0a0bc5f89d  -s ours

Change-Id: I9285c5fd38a0ecd532e69d20baa29e54e18ec93e

7 years agoMerge "Make a11y shortcut dialog themeable" into oc-mr1-dev
Phil Weaver [Wed, 2 Aug 2017 00:55:44 +0000 (00:55 +0000)]
Merge "Make a11y shortcut dialog themeable" into oc-mr1-dev
am: cdb70789d7

Change-Id: I9e53821d1cc2666187fd28f05203742c5325381e

7 years agoMerge "Cherry-picked some Autofill Javadoc improvements from master." into oc-dev...
Felipe Leme [Wed, 2 Aug 2017 00:51:45 +0000 (00:51 +0000)]
Merge "Cherry-picked some Autofill Javadoc improvements from " into oc-dev am: 6829a1dace am: 27eb322ed2  -s ours
am: dd187f4a82  -s ours

Change-Id: I66774912fda7acd0259644b45c40fd8d94086626

7 years agoMerge "Merge "Cherry-picked some Autofill Javadoc improvements from master." into...
Android Build Merger (Role) [Wed, 2 Aug 2017 00:47:17 +0000 (00:47 +0000)]
Merge "Merge "Cherry-picked some Autofill Javadoc improvements from " into oc-dev am: 6829a1dace am: 27eb322ed2  -s ours" into oc-mr1-dev

7 years agoImprove docs about exceptions through Binder.
Dianne Hackborn [Wed, 2 Aug 2017 00:41:00 +0000 (17:41 -0700)]
Improve docs about exceptions through Binder.

Test: built

Change-Id: I5b6af61daa373c92f7d7b3b341a20fbd9e691da9

7 years agoMerge "Cherry-picked some Autofill Javadoc improvements from master." into oc-dev...
Felipe Leme [Wed, 2 Aug 2017 00:44:17 +0000 (00:44 +0000)]
Merge "Cherry-picked some Autofill Javadoc improvements from " into oc-dev am: 6829a1dace am: 27eb322ed2
am: 4e051d9da9  -s ours

Change-Id: I31751578bdf17a66f0abae25375b14ce22a8cddb

7 years agoMerge "Cherry-picked some Autofill Javadoc improvements from master." into oc-dev...
Felipe Leme [Wed, 2 Aug 2017 00:44:00 +0000 (00:44 +0000)]
Merge "Cherry-picked some Autofill Javadoc improvements from " into oc-dev am: 6829a1dace
am: 27eb322ed2  -s ours

Change-Id: I44079cc5dec0f7c513370ae9effdcd93180da38c

7 years agoMerge "Make a11y shortcut dialog themeable" into oc-mr1-dev
TreeHugger Robot [Wed, 2 Aug 2017 00:43:41 +0000 (00:43 +0000)]
Merge "Make a11y shortcut dialog themeable" into oc-mr1-dev

7 years agoMerge "Cherry-picked some Autofill Javadoc improvements from master." into oc-dev...
Felipe Leme [Wed, 2 Aug 2017 00:35:45 +0000 (00:35 +0000)]
Merge "Cherry-picked some Autofill Javadoc improvements from " into oc-dev am: 6829a1dace
am: 27eb322ed2  -s ours

Change-Id: I4e65c04b63813ef95ec8bb99e783dfe223ca7a5a

7 years agoMerge "Cherry-picked some Autofill Javadoc improvements from master." into oc-dev...
Felipe Leme [Wed, 2 Aug 2017 00:35:44 +0000 (00:35 +0000)]
Merge "Cherry-picked some Autofill Javadoc improvements from " into oc-dev am: 6829a1dace
am: 27eb322ed2

Change-Id: Ib78f7d5d690eff9a7b6c424600e1f0a300417b16

7 years agoMerge "Cherry-picked some Autofill Javadoc improvements from master." into oc-dev
Felipe Leme [Wed, 2 Aug 2017 00:26:39 +0000 (00:26 +0000)]
Merge "Cherry-picked some Autofill Javadoc improvements from " into oc-dev
am: 6829a1dace

Change-Id: I00eed7ae9679f117296ad1f7162e057720e69aab