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

John Reck [Thu, 3 Aug 2017 01:33:30 +0000 (01:33 +0000)]

Merge "Fix compile issue" am: 27b56eb03f am: 60c65f1a67 am: 11d331a2af am: e25db57060
am: 66ce952a4e

Change-Id: I6882e50bfade31b43c71569a6fdff28d1ae86857

commit | commitdiff | tree

Santos Cordon [Thu, 3 Aug 2017 01:31:44 +0000 (01:31 +0000)]

Merge "Merge "Move VR preference for portrait orientation." into oc-dr1-dev am: 7c4069d255 am: ebc05a6a42" into oc-mr1-dev-plus-aosp
am: 5c179e8edb

Change-Id: I0098636d5346993396d3c05c61525076e0fa5279

commit | commitdiff | tree

Steven Moreland [Thu, 3 Aug 2017 01:29:35 +0000 (01:29 +0000)]

Merge "com.android.server: use proper nativehelper headers" am: 41a7f5a64f -s ours am: 79e124c9c7 -s ours am: 0666e1cd5c -s ours am: 4033c5e1b7 -s ours
am: c704b0379f -s ours

Change-Id: I9e8ab06e4b6e9f08bb01909efbb0aff03c44bb67

commit | commitdiff | tree

Ningyuan Wang [Thu, 3 Aug 2017 01:27:18 +0000 (01:27 +0000)]

Merge "Merge "Merge changes from topic 'do_not_roam_on_traffic' into oc-dr1-dev am: 54e6518fc8" into oc-mr1-dev am: b1e8d97867" into oc-mr1-dev-plus-aosp
am: 60d63fa4fb

Change-Id: I68a0642f288973a25d1756508e23313f2e318c06

commit | commitdiff | tree

Christine Franks [Thu, 3 Aug 2017 01:25:05 +0000 (01:25 +0000)]

Merge "Merge "Merge "Prevent crash dialogs from appearing in demo mode" into oc-dr1-dev am: 8d753bc3a3" into oc-mr1-dev am: 93111a9762" into oc-mr1-dev-plus-aosp
am: f0747920e0

Change-Id: If2095bfcc7408c9ccbe5384f001339a84766d932

commit | commitdiff | tree

Adrian Roos [Thu, 3 Aug 2017 01:23:12 +0000 (01:23 +0000)]

Merge "Merge "Merge "WakeAndUnlock: Make sure to wait for screen turning on" into oc-dr1-dev am: 46f2cdeb63" into oc-mr1-dev am: ad825bdfd7" into oc-mr1-dev-plus-aosp
am: 64cd09456d

Change-Id: I3b87a4a25e69d01526cd5f051cdf9d3553c1ad1c

commit | commitdiff | tree

Brad Ebinger [Thu, 3 Aug 2017 01:19:47 +0000 (01:19 +0000)]

Merge "Merge "Merge "Remove Conferenceable update squelching" into oc-dr1-dev am: 4b6ef9c92d" into oc-mr1-dev am: e57175c090" into oc-mr1-dev-plus-aosp
am: 482e35d51a

Change-Id: I59d952ec0dd395d7b553ca4edb9b71c51a300b97

commit | commitdiff | tree

Tarandeep Singh [Thu, 3 Aug 2017 01:15:07 +0000 (01:15 +0000)]

Merge "Merge "Merge "Fix keyboard focus in VR" into oc-dr1-dev am: 986995d481" into oc-mr1-dev am: 1cec6be3f5" into oc-mr1-dev-plus-aosp
am: 68122681b9

Change-Id: Ia0d7088975b03d978e66b6d6ed5f209a3159014b

commit | commitdiff | tree

Chien-Yu Chen [Thu, 3 Aug 2017 01:12:11 +0000 (01:12 +0000)]

Merge "Merge "Merge "camera2: Fix template requirements" into oc-dev am: 2976109d89 am: 615f9e1277" into oc-mr1-dev am: 334e733ea2" into oc-mr1-dev-plus-aosp
am: 8483409421

Change-Id: I5446a96e0aab856aed2d42e950fc00d7abc03e60

commit | commitdiff | tree

Santos Cordon [Thu, 3 Aug 2017 01:10:08 +0000 (01:10 +0000)]

Merge "Merge "Move VR preference for portrait orientation." into oc-dr1-dev am: 7c4069d255 am: 5af217b346" into oc-mr1-dev-plus-aosp
am: faf9590064

Change-Id: I3c3372dfcc55d38b37e8fedafaf494343e44e119

commit | commitdiff | tree

Santos Cordon [Thu, 3 Aug 2017 01:07:52 +0000 (01:07 +0000)]

Merge "Merge "Merge "Ensure that all displays are updated upon any changes to rotation." into oc-dr1-dev am: adec8518af" into oc-mr1-dev am: 988a6dd5e3" into oc-mr1-dev-plus-aosp
am: 5b9d5fe641

Change-Id: Ie359b22486c753a98522882c021e90f8b4c1be63

commit | commitdiff | tree

Josh Gao [Thu, 3 Aug 2017 01:03:29 +0000 (01:03 +0000)]

Merge "Merge "zygote: always log process exit reason." am: b14694b043 am: 1453059ae3 am: c4f129121e am: 1535b8ca3b" into oc-mr1-dev-plus-aosp
am: 1a23e3c461

Change-Id: I75e8d2889b7671a3806478c42aab7c238a44b8eb

commit | commitdiff | tree

Selim Cinek [Thu, 3 Aug 2017 01:01:17 +0000 (01:01 +0000)]

Merge "Merge "Fixed a clipping issue in AOD" into oc-dr1-dev am: 0ee78fd385" into oc-mr1-dev am: 4f4535500e
am: 5135014626

Change-Id: Ia4813c198bf9fb5dd3c3bea7de33751b47fde17e

commit | commitdiff | tree

Jorim Jaggi [Thu, 3 Aug 2017 00:59:32 +0000 (00:59 +0000)]

Merge "Merge "Start all visible running activities when attaching app" into oc-dr1-dev am: 2af6f25f43" into oc-mr1-dev am: 966fbc0435
am: 93cc4ae19b

Change-Id: I447c10f04b0cec75e4ae12f8fa05df27a04b8441

commit | commitdiff | tree

Ningyuan Wang [Thu, 3 Aug 2017 00:57:08 +0000 (00:57 +0000)]

Merge "Merge changes from topic 'do_not_roam_on_traffic' into oc-dr1-dev am: 54e6518fc8 am: 2ac51662c2" into oc-mr1-dev-plus-aosp
am: 3debaf9639

Change-Id: I4c3a0ba70d7270ff52e6eae2a9a68b593b4400b7

commit | commitdiff | tree

Christine Franks [Thu, 3 Aug 2017 00:55:15 +0000 (00:55 +0000)]

Merge "Merge "Prevent crash dialogs from appearing in demo mode" into oc-dr1-dev am: 8d753bc3a3 am: 27191ac475" into oc-mr1-dev-plus-aosp
am: a336d8a57b

Change-Id: I7bc11d9f0dca717c850c0de3f86dcc835e0f92ca

commit | commitdiff | tree

Steven Moreland [Thu, 3 Aug 2017 00:49:28 +0000 (00:49 +0000)]

Merge "Merge "services.core: remove use of -static hidl java" into stage-aosp-master am: e79a0931f7 am: 9bd5b76318 -s ours am: 9dbda410bc -s ours" into oc-mr1-dev-plus-aosp
am: 67433d3fe8 -s ours

Change-Id: Id726896f8e89d3281826b3fd0b498f463b02bd05

commit | commitdiff | tree

Adrian Roos [Thu, 3 Aug 2017 00:47:38 +0000 (00:47 +0000)]

Merge "Merge "WakeAndUnlock: Make sure to wait for screen turning on" into oc-dr1-dev am: 46f2cdeb63 am: 21cd29e235" into oc-mr1-dev-plus-aosp
am: 62fe11f830

Change-Id: Ida4e0311b2d41f9dfaccd34a6bb19ec03f74e8ed

commit | commitdiff | tree

Adrian Roos [Thu, 3 Aug 2017 00:44:43 +0000 (00:44 +0000)]

Merge "Merge "Merge "SysUI: Move all sensor operations to the background thread" into oc-dr1-dev am: e81cdeea1c" into oc-mr1-dev am: 17d16ef49b" into oc-mr1-dev-plus-aosp
am: 28ba07c40b

Change-Id: I16f0c6b54472151a4d77dc17ce99e076d1b57717

commit | commitdiff | tree

Jeff Sharkey [Thu, 3 Aug 2017 00:38:01 +0000 (00:38 +0000)]

Merge "Merge "Merge "Fix NPE when reading icon for removed session." into oc-dr1-dev am: 65abebbadd" into oc-mr1-dev am: 25cdef21dc" into oc-mr1-dev-plus-aosp
am: f749719e53

Change-Id: Id188cf438f1425c266e6806f231fb65987a4f13c

commit | commitdiff | tree

Brad Ebinger [Thu, 3 Aug 2017 00:36:19 +0000 (00:36 +0000)]

Merge "Merge "Remove Conferenceable update squelching" into oc-dr1-dev am: 4b6ef9c92d am: 27d9ca08da" into oc-mr1-dev-plus-aosp
am: b22e5a3b26

Change-Id: I693583e03a714bb4d8dbd2b6aefdb862ac0c0cdd

commit | commitdiff | tree

Jeff Sharkey [Thu, 3 Aug 2017 00:34:26 +0000 (00:34 +0000)]

Merge "Merge "Give DeviceStorageMonitorService it's own thread." into oc-mr1-dev am: fe268483d0" into oc-mr1-dev-plus-aosp
am: 86ff14f476

Change-Id: I93bf2a67e6d84cb91ff36d447c3fcd4156787e95

commit | commitdiff | tree

John Reck [Thu, 3 Aug 2017 00:22:13 +0000 (00:22 +0000)]

Merge "Fix compile issue" am: 27b56eb03f am: 60c65f1a67 am: 11d331a2af
am: e25db57060

Change-Id: Ibf6b77fae613c255dbd85ff3b565d79bcd5f04bb

commit | commitdiff | tree

TreeHugger Robot [Thu, 3 Aug 2017 00:19:44 +0000 (00:19 +0000)]

Merge "Add backend ISO and Focal Length support to Metadata Reader"

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 3 Aug 2017 00:16:54 +0000 (00:16 +0000)]

Merge "Merge "Move VR preference for portrait orientation." into oc-dr1-dev am: 7c4069d255 am: ebc05a6a42" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Santos Cordon [Thu, 3 Aug 2017 00:14:15 +0000 (00:14 +0000)]

Merge "Move VR preference for portrait orientation." into oc-dr1-dev am: 7c4069d255
am: ebc05a6a42

Change-Id: I180ffea5b3ac59019b64f2d7859794faecf1fb10

commit | commitdiff | tree

Steven Moreland [Thu, 3 Aug 2017 00:12:49 +0000 (00:12 +0000)]

Merge "com.android.server: use proper nativehelper headers" am: 41a7f5a64f -s ours am: 79e124c9c7 -s ours am: 0666e1cd5c -s ours
am: 4033c5e1b7 -s ours

Change-Id: I0123c124dcd6f0b74af3c6c57783e318c0892323

commit | commitdiff | tree

John Reck [Thu, 3 Aug 2017 00:06:48 +0000 (00:06 +0000)]

Merge "Fix compile issue" am: 27b56eb03f am: 60c65f1a67
am: 11d331a2af

Change-Id: I6f293b65cfc734beeafc510baa7121945de208e4

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 3 Aug 2017 00:04:48 +0000 (00:04 +0000)]

Merge "Merge "Merge changes from topic 'do_not_roam_on_traffic' into oc-dr1-dev am: 54e6518fc8" into oc-mr1-dev am: b1e8d97867" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Ningyuan Wang [Thu, 3 Aug 2017 00:02:52 +0000 (00:02 +0000)]

Merge "Merge changes from topic 'do_not_roam_on_traffic' into oc-dr1-dev am: 54e6518fc8" into oc-mr1-dev
am: b1e8d97867

Change-Id: Ifd8b2fcb43d8cc59fda3a59ef358442d7dd80b3c

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 3 Aug 2017 00:02:17 +0000 (00:02 +0000)]

Merge "Merge "Merge "Prevent crash dialogs from appearing in demo mode" into oc-dr1-dev am: 8d753bc3a3" into oc-mr1-dev am: 93111a9762" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Christine Franks [Thu, 3 Aug 2017 00:00:40 +0000 (00:00 +0000)]

Merge "Merge "Prevent crash dialogs from appearing in demo mode" into oc-dr1-dev am: 8d753bc3a3" into oc-mr1-dev
am: 93111a9762

Change-Id: I9f39b8bbead5993bd147577a0452a19d56f71d35

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 3 Aug 2017 00:00:16 +0000 (00:00 +0000)]

Merge "Merge "Merge "WakeAndUnlock: Make sure to wait for screen turning on" into oc-dr1-dev am: 46f2cdeb63" into oc-mr1-dev am: ad825bdfd7" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Adrian Roos [Wed, 2 Aug 2017 23:58:25 +0000 (23:58 +0000)]

Merge "Merge "WakeAndUnlock: Make sure to wait for screen turning on" into oc-dr1-dev am: 46f2cdeb63" into oc-mr1-dev
am: ad825bdfd7

Change-Id: I38873a197f94af5013cf8fdd8ad014969bae14f8

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 2 Aug 2017 23:57:26 +0000 (23:57 +0000)]

Merge "Merge "Merge "Remove Conferenceable update squelching" into oc-dr1-dev am: 4b6ef9c92d" into oc-mr1-dev am: e57175c090" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Steven Moreland [Wed, 2 Aug 2017 23:56:20 +0000 (23:56 +0000)]

Merge "com.android.server: use proper nativehelper headers" am: 41a7f5a64f -s ours am: 79e124c9c7 -s ours
am: 0666e1cd5c -s ours

Change-Id: Ibddc7b339d8cba53c73b2471bab11eabca82fa33

commit | commitdiff | tree

John Reck [Wed, 2 Aug 2017 23:55:41 +0000 (23:55 +0000)]

Merge "Fix compile issue" am: 27b56eb03f
am: 60c65f1a67

Change-Id: I8ee620ac2fec24c56a40f2b9be1aa0665a0146bf

commit | commitdiff | tree

Brad Ebinger [Wed, 2 Aug 2017 23:54:47 +0000 (23:54 +0000)]

Merge "Merge "Remove Conferenceable update squelching" into oc-dr1-dev am: 4b6ef9c92d" into oc-mr1-dev
am: e57175c090

Change-Id: I7f2776087d873bbd3c25c130a2ee14dfbe6bf7b5

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 2 Aug 2017 23:54:18 +0000 (23:54 +0000)]

Merge "Merge "Merge "Fix keyboard focus in VR" into oc-dr1-dev am: 986995d481" into oc-mr1-dev am: 1cec6be3f5" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Evan Rosky [Wed, 2 Aug 2017 23:52:48 +0000 (23:52 +0000)]

Merge "Merge "Gracefully handle focus loops created by app dev." into oc-dr1-dev am: ae938cee71 am: 64dd913f68" into oc-mr1-dev-plus-aosp
am: 49a29f000f

Change-Id: Ib2b8b1bddf40bb83ee534948147458c2e7823a38

commit | commitdiff | tree

Tarandeep Singh [Wed, 2 Aug 2017 23:50:51 +0000 (23:50 +0000)]

Merge "Merge "Fix keyboard focus in VR" into oc-dr1-dev am: 986995d481" into oc-mr1-dev
am: 1cec6be3f5

Change-Id: Idc939a1811dc84174cdba7912e4f8a4a0915f688

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 2 Aug 2017 23:48:28 +0000 (23:48 +0000)]

Merge "Merge "Merge "camera2: Fix template requirements" into oc-dev am: 2976109d89 am: 615f9e1277" into oc-mr1-dev am: 334e733ea2" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

John Reck [Wed, 2 Aug 2017 23:47:23 +0000 (23:47 +0000)]

Merge "Fix compile issue"
am: 27b56eb03f

Change-Id: I052fdfdc4f3a75f9ddaa6e9e445d706e22574113

commit | commitdiff | tree

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

Merge "Merge "Move VR preference for portrait orientation." into oc-dr1-dev am: 7c4069d255 am: 5af217b346" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Chien-Yu Chen [Wed, 2 Aug 2017 23:45:42 +0000 (23:45 +0000)]

Merge "Merge "camera2: Fix template requirements" into oc-dev am: 2976109d89 am: 615f9e1277" into oc-mr1-dev
am: 334e733ea2

Change-Id: I30a14e0e9677158082cf83a04328697c50c5587d

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 2 Aug 2017 23:44:54 +0000 (23:44 +0000)]

Merge "Merge "Merge "Ensure that all displays are updated upon any changes to rotation." into oc-dr1-dev am: adec8518af" into oc-mr1-dev am: 988a6dd5e3" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Santos Cordon [Wed, 2 Aug 2017 23:44:41 +0000 (23:44 +0000)]

Merge "Move VR preference for portrait orientation." into oc-dr1-dev am: 7c4069d255
am: 5af217b346

Change-Id: Ia961f9732df252a825a5b86385aeb723c69c0dee

commit | commitdiff | tree

Steven Moreland [Wed, 2 Aug 2017 23:44:30 +0000 (23:44 +0000)]

Merge "com.android.server: use proper nativehelper headers" am: 41a7f5a64f -s ours
am: 79e124c9c7 -s ours

Change-Id: I550d6ce82513fc8e160597ba2ff89b6c5efa286a

commit | commitdiff | tree

Tarandeep Singh [Wed, 2 Aug 2017 23:44:16 +0000 (23:44 +0000)]

Merge "Merge "Fix keyboard focus in VR" into oc-dr1-dev am: 986995d481 am: 7def2eea97" into oc-mr1-dev-plus-aosp
am: 6f6cc83cf3

Change-Id: I9ceea32fa06bab6416a341998425e9d176c054e6

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 2 Aug 2017 23:43:33 +0000 (23:43 +0000)]

Merge "Merge "zygote: always log process exit reason." am: b14694b043 am: 1453059ae3 am: c4f129121e am: 1535b8ca3b" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Santos Cordon [Wed, 2 Aug 2017 23:43:27 +0000 (23:43 +0000)]

Merge "Merge "Ensure that all displays are updated upon any changes to rotation." into oc-dr1-dev am: adec8518af" into oc-mr1-dev
am: 988a6dd5e3

Change-Id: I12d0a463d4f397b213aa83e434e983689ecdd075

commit | commitdiff | tree

Josh Gao [Wed, 2 Aug 2017 23:41:39 +0000 (23:41 +0000)]

Merge "zygote: always log process exit reason." am: b14694b043 am: 1453059ae3 am: c4f129121e
am: 1535b8ca3b

Change-Id: I3b22c17c86b80888167654ee18cb8bac3dbadb88

commit | commitdiff | tree

Steven Moreland [Wed, 2 Aug 2017 23:40:48 +0000 (23:40 +0000)]

Merge "Merge "Reland "services.core: remove use of -static hidl java"" into oc-dr1-dev-plus-aosp am: 9f11a24d9c" into oc-mr1-dev-plus-aosp
am: b32d55c6bc

Change-Id: I2824b5a2df1852e7dc8e1e591e4447ccf49e7d73

commit | commitdiff | tree

Selim Cinek [Wed, 2 Aug 2017 23:40:32 +0000 (23:40 +0000)]

Merge "Merge "Fixed a clipping issue in AOD" into oc-dr1-dev am: 0ee78fd385" into oc-mr1-dev
am: 4f4535500e

Change-Id: I999883d77a28bc72b0fb5db7d8fc17a32213ede6

commit | commitdiff | tree

Jorim Jaggi [Wed, 2 Aug 2017 23:38:31 +0000 (23:38 +0000)]

Merge "Merge "Start all visible running activities when attaching app" into oc-dr1-dev am: 2af6f25f43" into oc-mr1-dev
am: 966fbc0435

Change-Id: I6946948432e0d11271af1b13af99f2eea49698cd

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 2 Aug 2017 23:37:04 +0000 (23:37 +0000)]

Merge "Merge changes from topic 'do_not_roam_on_traffic' into oc-dr1-dev am: 54e6518fc8 am: 2ac51662c2" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Daniel Sandler [Wed, 2 Aug 2017 23:33:21 +0000 (23:33 +0000)]

Merge "Merge "Send TYPE_NOTIFICATION_STATE_CHANGED events for IMPORTANCE_LOW notifications." into oc-dr1-dev am: c7937c13f6 -s ours am: be0b8cdfa9" into oc-mr1-dev-plus-aosp
am: 3df052495b

Change-Id: I804df477f0f340cf66428cd3935dba3aa03a28a4

commit | commitdiff | tree

Ningyuan Wang [Wed, 2 Aug 2017 23:33:16 +0000 (23:33 +0000)]

Merge changes from topic 'do_not_roam_on_traffic' into oc-dr1-dev am: 54e6518fc8
am: 2ac51662c2

Change-Id: Iba59ba59df4bd1a5e773da6a76e54ee092ac551f

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 2 Aug 2017 23:31:46 +0000 (23:31 +0000)]

Merge "Merge "Prevent crash dialogs from appearing in demo mode" into oc-dr1-dev am: 8d753bc3a3 am: 27191ac475" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Chien-Yu Chen [Wed, 2 Aug 2017 23:31:25 +0000 (23:31 +0000)]

Merge "Merge "camera2: Fix template requirements" into oc-dev am: 2976109d89 am: d5cc64f349" into oc-dr1-dev-plus-aosp am: 8e00d3f2bf
am: 2a1c3d976d

Change-Id: I6dbc6475e36beb65b865e18e31f79177c8608cda

commit | commitdiff | tree

Christine Franks [Wed, 2 Aug 2017 23:29:12 +0000 (23:29 +0000)]

Merge "Prevent crash dialogs from appearing in demo mode" into oc-dr1-dev am: 8d753bc3a3
am: 27191ac475

Change-Id: I195d9e0f5536ac12ae4622e011fb3a0f0b01d3c3

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 2 Aug 2017 23:28:45 +0000 (23:28 +0000)]

Merge "Merge "services.core: remove use of -static hidl java" into stage-aosp-master am: e79a0931f7 am: 9bd5b76318 -s ours am: 9dbda410bc -s ours" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Chien-Yu Chen [Wed, 2 Aug 2017 23:28:32 +0000 (23:28 +0000)]

Merge "camera2: Fix template requirements" into oc-dev am: 2976109d89 am: 615f9e1277 am: 5a7aefdb3d
am: 3dd904da89

Change-Id: I24a94de47634379da81072f6409da7444d4ce34a

commit | commitdiff | tree

Steven Moreland [Wed, 2 Aug 2017 23:26:20 +0000 (23:26 +0000)]

Merge "services.core: remove use of -static hidl java" into stage-aosp-master am: e79a0931f7 am: 9bd5b76318 -s ours
am: 9dbda410bc -s ours

Change-Id: I287db1685c0ff95c8b9516b86014b7d05affb9a5

commit | commitdiff | tree

Treehugger Robot [Wed, 2 Aug 2017 23:25:32 +0000 (23:25 +0000)]

Merge "Fix compile issue"

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 2 Aug 2017 23:25:13 +0000 (23:25 +0000)]

Merge "Merge "WakeAndUnlock: Make sure to wait for screen turning on" into oc-dr1-dev am: 46f2cdeb63 am: 21cd29e235" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Santos Cordon [Wed, 2 Aug 2017 23:24:00 +0000 (23:24 +0000)]

Merge "Ensure that all displays are updated upon any changes to rotation." into oc-dr1-dev am: adec8518af am: e061cc2e62
am: 78059e9f1b

Change-Id: I2bee5bfcd57b09a1d06e3a670efa3233d4f659dc

commit | commitdiff | tree

Santos Cordon [Wed, 2 Aug 2017 23:22:17 +0000 (23:22 +0000)]

Merge "Move VR preference for portrait orientation." into oc-dr1-dev
am: 7c4069d255

Change-Id: Ifc4138b41e801baf2acb06f83fd77115a74e71f2

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 2 Aug 2017 23:21:21 +0000 (23:21 +0000)]

Merge "Merge "Merge "SysUI: Move all sensor operations to the background thread" into oc-dr1-dev am: e81cdeea1c" into oc-mr1-dev am: 17d16ef49b" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Adrian Roos [Wed, 2 Aug 2017 23:19:34 +0000 (23:19 +0000)]

Merge "WakeAndUnlock: Make sure to wait for screen turning on" into oc-dr1-dev am: 46f2cdeb63
am: 21cd29e235

Change-Id: I30034a1df51296ae3aa5bc74af65dca415d13873

commit | commitdiff | tree

Steven Moreland [Wed, 2 Aug 2017 23:19:33 +0000 (23:19 +0000)]

Merge "com.android.server: use proper nativehelper headers"
am: 41a7f5a64f -s ours

Change-Id: I470a1998cecb2254f38ea62b08e2408b9b3d4567

commit | commitdiff | tree

Santos Cordon [Wed, 2 Aug 2017 23:17:29 +0000 (23:17 +0000)]

Merge "Move VR preference for portrait orientation." into oc-dr1-dev
am: 7c4069d255

Change-Id: I3fee2180df9f1b18aae17eeae97b5f0006226c64

commit | commitdiff | tree

Adrian Roos [Wed, 2 Aug 2017 23:17:29 +0000 (23:17 +0000)]

Merge "Merge "SysUI: Move all sensor operations to the background thread" into oc-dr1-dev am: e81cdeea1c" into oc-mr1-dev
am: 17d16ef49b

Change-Id: Id0560024ee57a7d3487eca480fcf5053c544948c

commit | commitdiff | tree

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

Merge "Merge "Merge "Fix NPE when reading icon for removed session." into oc-dr1-dev am: 65abebbadd" into oc-mr1-dev am: 25cdef21dc" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 2 Aug 2017 23:14:40 +0000 (23:14 +0000)]

Merge "Merge changes from topic 'do_not_roam_on_traffic' into oc-dr1-dev am: 54e6518fc8" into oc-mr1-dev

commit | commitdiff | tree

Jeff Sharkey [Wed, 2 Aug 2017 23:14:12 +0000 (23:14 +0000)]

Merge "Merge "Fix NPE when reading icon for removed session." into oc-dr1-dev am: 65abebbadd" into oc-mr1-dev
am: 25cdef21dc

Change-Id: Ie12c51a826909b5224632bc26a871d984435b18a

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 2 Aug 2017 23:13:43 +0000 (23:13 +0000)]

Merge "Merge "Remove Conferenceable update squelching" into oc-dr1-dev am: 4b6ef9c92d am: 27d9ca08da" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 2 Aug 2017 23:13:27 +0000 (23:13 +0000)]

Merge "Merge "Give DeviceStorageMonitorService it's own thread." into oc-mr1-dev am: fe268483d0" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Selim Cinek [Wed, 2 Aug 2017 23:11:21 +0000 (23:11 +0000)]

Merge "Fixed a clipping issue in AOD" into oc-dr1-dev am: 0ee78fd385 am: cda30ced91
am: df6ce90ab9

Change-Id: I77b0023182c07301db35f7a3f8e67a75b6ae685b

commit | commitdiff | tree

Jeff Sharkey [Wed, 2 Aug 2017 23:10:34 +0000 (23:10 +0000)]

Merge "Give DeviceStorageMonitorService it's own thread." into oc-mr1-dev
am: fe268483d0

Change-Id: I490c840fa56354e0a2122e1ff389e433e50087aa

commit | commitdiff | tree

Brad Ebinger [Wed, 2 Aug 2017 23:10:28 +0000 (23:10 +0000)]

Merge "Remove Conferenceable update squelching" into oc-dr1-dev am: 4b6ef9c92d
am: 27d9ca08da

Change-Id: If7609c87ad507f9ec6cd3fd19d779e68c55e6280

commit | commitdiff | tree

Ningyuan Wang [Wed, 2 Aug 2017 23:10:14 +0000 (23:10 +0000)]

Merge changes from topic 'do_not_roam_on_traffic' into oc-dr1-dev
am: 54e6518fc8

Change-Id: Ic02b8506afbd900d1fec0946148cd8f1a76ee5ce

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 2 Aug 2017 23:10:09 +0000 (23:10 +0000)]

Merge "Merge "Gracefully handle focus loops created by app dev." into oc-dr1-dev am: ae938cee71 am: 64dd913f68" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 2 Aug 2017 23:09:40 +0000 (23:09 +0000)]

Merge "Merge "Prevent crash dialogs from appearing in demo mode" into oc-dr1-dev am: 8d753bc3a3" into oc-mr1-dev

commit | commitdiff | tree

Jorim Jaggi [Wed, 2 Aug 2017 23:09:12 +0000 (23:09 +0000)]

Merge "Start all visible running activities when attaching app" into oc-dr1-dev am: 2af6f25f43 am: d80432788e
am: 9d92da56fe

Change-Id: I113dc1bfc6d716526086fabfc21e6019701bb9b5

commit | commitdiff | tree

Christine Franks [Wed, 2 Aug 2017 23:07:31 +0000 (23:07 +0000)]

Merge "Prevent crash dialogs from appearing in demo mode" into oc-dr1-dev
am: 8d753bc3a3

Change-Id: I138f6c945606caaaf129de5625c4d9bb7add42d8

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 2 Aug 2017 23:07:00 +0000 (23:07 +0000)]

Merge "Merge "WakeAndUnlock: Make sure to wait for screen turning on" into oc-dr1-dev am: 46f2cdeb63" into oc-mr1-dev

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 2 Aug 2017 23:06:59 +0000 (23:06 +0000)]

Merge "Merge "Fix keyboard focus in VR" into oc-dr1-dev am: 986995d481 am: 7def2eea97" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Adrian Roos [Wed, 2 Aug 2017 23:06:47 +0000 (23:06 +0000)]

Merge "SysUI: Move all sensor operations to the background thread" into oc-dr1-dev am: e81cdeea1c am: 31cae6e859
am: 4c13e2dddb

Change-Id: I3856f8c0a087e776e6849c650ae2485d39d59ff6

commit | commitdiff | tree

Evan Rosky [Wed, 2 Aug 2017 23:06:40 +0000 (23:06 +0000)]

Merge "Gracefully handle focus loops created by app dev." into oc-dr1-dev am: ae938cee71
am: 64dd913f68

Change-Id: Idd3ad3c47651b229e9b1642cee03af2288458712

commit | commitdiff | tree

Adrian Roos [Wed, 2 Aug 2017 23:05:12 +0000 (23:05 +0000)]

Merge "WakeAndUnlock: Make sure to wait for screen turning on" into oc-dr1-dev
am: 46f2cdeb63

Change-Id: Ibdbeefd3c375504e935f938fe6e5008644ef7b66

commit | commitdiff | tree

Tarandeep Singh [Wed, 2 Aug 2017 23:04:58 +0000 (23:04 +0000)]

Merge "Fix keyboard focus in VR" into oc-dr1-dev am: 986995d481
am: 7def2eea97

Change-Id: I538777a295628827fc3052c58641cbb659afad20

commit | commitdiff | tree

Jeff Sharkey [Wed, 2 Aug 2017 23:04:49 +0000 (23:04 +0000)]

Merge "Fix NPE when reading icon for removed session." into oc-dr1-dev am: 65abebbadd am: eb6733e93a
am: 1ab9c0cdff

Change-Id: I24a948b29145434376b03c3e12d23f7c7a83b0f4

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 2 Aug 2017 23:04:34 +0000 (23:04 +0000)]

Merge "Merge "Remove Conferenceable update squelching" into oc-dr1-dev am: 4b6ef9c92d" into oc-mr1-dev

commit | commitdiff | tree

Brad Ebinger [Wed, 2 Aug 2017 23:02:46 +0000 (23:02 +0000)]

Merge "Remove Conferenceable update squelching" into oc-dr1-dev
am: 4b6ef9c92d

Change-Id: I30fbedd2fa26482d520fef48f0dd81aa923b06b7

commit | commitdiff | tree

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

Merge "Merge "Fix keyboard focus in VR" into oc-dr1-dev am: 986995d481" into oc-mr1-dev

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 2 Aug 2017 23:02:06 +0000 (23:02 +0000)]

Merge "Merge "Reland "services.core: remove use of -static hidl java"" into oc-dr1-dev-plus-aosp am: 9f11a24d9c" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Treehugger Robot [Wed, 2 Aug 2017 23:02:04 +0000 (23:02 +0000)]

Merge "com.android.server: use proper nativehelper headers"

commit | commitdiff | tree

Evan Rosky [Wed, 2 Aug 2017 23:00:57 +0000 (23:00 +0000)]

Merge "Gracefully handle focus loops created by app dev." into oc-dr1-dev am: ae938cee71 am: 756685b506
am: caab68931b

Change-Id: I22e1e9364d586579942f968d2f6e52687a8db276

commit | commitdiff | tree

Steven Moreland [Wed, 2 Aug 2017 23:00:50 +0000 (23:00 +0000)]

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

Change-Id: If67fbbe4faa24eb01312a15e50763c0b297f271b