OSDN Git Service

android-x86/frameworks-base.git
6 years agoMerge "Revert "Increased the text size for colorized notifications"" into oc-mr1-dev
Selim Cinek [Thu, 21 Sep 2017 01:38:09 +0000 (01:38 +0000)]
Merge "Revert "Increased the text size for colorized notifications"" into oc-mr1-dev
am: 204346c277

Change-Id: I0723bc15fb651881ee9c42fd59c2a94abc761c42

6 years agoMerge "Revert "Increased the text size for colorized notifications"" into oc-mr1-dev
TreeHugger Robot [Thu, 21 Sep 2017 01:29:53 +0000 (01:29 +0000)]
Merge "Revert "Increased the text size for colorized notifications"" into oc-mr1-dev

6 years agoMerge "have OffloaderController store and re-push more state" into oc-mr1-dev
Erik Kline [Wed, 20 Sep 2017 23:39:11 +0000 (23:39 +0000)]
Merge "have OffloaderController store and re-push more state" into oc-mr1-dev
am: 1dd52a8017

Change-Id: If3a859736a1b3730e4e3d0d2685f3e5432927796

6 years agoMerge "have OffloaderController store and re-push more state" into oc-mr1-dev
TreeHugger Robot [Wed, 20 Sep 2017 23:28:08 +0000 (23:28 +0000)]
Merge "have OffloaderController store and re-push more state" into oc-mr1-dev

6 years agoRevert "Increased the text size for colorized notifications"
Selim Cinek [Wed, 20 Sep 2017 22:52:29 +0000 (22:52 +0000)]
Revert "Increased the text size for colorized notifications"

This reverts commit 299b3302ef6ea5094f094e92f384853aa012172b.

Change-Id: Id887bd37f8f7b0c1ff48c339c9d59491f65cae84
Bug: 35925915
Fixes: 66067974

6 years agoMerge "De-couple data enabled from VT settings." am: 29fc1d78a9 am: c7588904ba
Tyler Gunn [Wed, 20 Sep 2017 21:37:39 +0000 (21:37 +0000)]
Merge "De-couple data enabled from VT settings." am: 29fc1d78a9 am: c7588904ba
am: 28097531ac

Change-Id: Ib214d4838862e2f841d318769c56fd749f7aeded

6 years agoMerge "De-couple data enabled from VT settings." am: 29fc1d78a9
Tyler Gunn [Wed, 20 Sep 2017 21:31:53 +0000 (21:31 +0000)]
Merge "De-couple data enabled from VT settings." am: 29fc1d78a9
am: c7588904ba

Change-Id: I8b0d606848baa6cec1543a95b87ddf0cf0ba1ec6

6 years agoMerge "De-couple data enabled from VT settings."
Tyler Gunn [Wed, 20 Sep 2017 21:25:44 +0000 (21:25 +0000)]
Merge "De-couple data enabled from VT settings."
am: 29fc1d78a9

Change-Id: I39c1ec07eb087830605b603dbf420bfa6a4385f2

6 years agoMerge "Track the earliest alarm for exiting DND." into oc-mr1-dev
Julia Reynolds [Wed, 20 Sep 2017 20:20:19 +0000 (20:20 +0000)]
Merge "Track the earliest alarm for exiting DND." into oc-mr1-dev
am: 082e11b28d

Change-Id: I5fad835e1327d9ebdc29c268124525153d5d7aa0

6 years agoMerge "De-couple data enabled from VT settings."
Tyler Gunn [Wed, 20 Sep 2017 20:19:30 +0000 (20:19 +0000)]
Merge "De-couple data enabled from VT settings."

6 years agoMerge "DND apps might not have a service, and that's ok" into oc-mr1-dev
Julia Reynolds [Wed, 20 Sep 2017 20:14:17 +0000 (20:14 +0000)]
Merge "DND apps might not have a service, and that's ok" into oc-mr1-dev
am: 098dae1b3e

Change-Id: I2bc381f8f155033fa218d43af8842044626e3404

6 years agoMerge "Track the earliest alarm for exiting DND." into oc-mr1-dev
TreeHugger Robot [Wed, 20 Sep 2017 20:02:05 +0000 (20:02 +0000)]
Merge "Track the earliest alarm for exiting DND." into oc-mr1-dev

6 years agoMerge "DND apps might not have a service, and that's ok" into oc-mr1-dev
TreeHugger Robot [Wed, 20 Sep 2017 20:01:33 +0000 (20:01 +0000)]
Merge "DND apps might not have a service, and that's ok" into oc-mr1-dev

6 years agoMerge "Convert ICarrierService to oneway." into oc-mr1-dev
Jonathan Basseri [Wed, 20 Sep 2017 19:24:24 +0000 (19:24 +0000)]
Merge "Convert ICarrierService to oneway." into oc-mr1-dev
am: 806af68f5d

Change-Id: Ifd29502f4fb0ad02216e6f9b7c48cb332f89dea2

6 years agoMerge "LegacyCamera: fix wrong class name in JNI" into oc-mr1-dev
Yin-Chia Yeh [Wed, 20 Sep 2017 19:16:50 +0000 (19:16 +0000)]
Merge "LegacyCamera: fix wrong class name in JNI" into oc-mr1-dev
am: b1b99b0299

Change-Id: I1f4817fbc32ba186229eb36fe726e6f4ff2fad16

6 years agoMerge "Convert ICarrierService to oneway." into oc-mr1-dev
Jonathan Basseri [Wed, 20 Sep 2017 19:16:24 +0000 (19:16 +0000)]
Merge "Convert ICarrierService to oneway." into oc-mr1-dev

6 years agoMerge "Add Telephony connection event for call forwarded supp service notice." am...
Tyler Gunn [Wed, 20 Sep 2017 19:11:15 +0000 (19:11 +0000)]
Merge "Add Telephony connection event for call forwarded supp service notice." am: 9cc6286675 am: 53a0c05f47
am: fea3f2e8c6

Change-Id: I2ef9f40ec0487faa19ea8aa005607296d646e78a

6 years agoMerge "LegacyCamera: fix wrong class name in JNI" into oc-mr1-dev
TreeHugger Robot [Wed, 20 Sep 2017 19:06:01 +0000 (19:06 +0000)]
Merge "LegacyCamera: fix wrong class name in JNI" into oc-mr1-dev

6 years agoMerge "Add Telephony connection event for call forwarded supp service notice." am...
Tyler Gunn [Wed, 20 Sep 2017 19:03:24 +0000 (19:03 +0000)]
Merge "Add Telephony connection event for call forwarded supp service notice." am: 9cc6286675
am: 53a0c05f47

Change-Id: I1aa5936c8246cae56d886573f116b8d55a70834d

6 years agoMerge "Add Telephony connection event for call forwarded supp service notice."
Tyler Gunn [Wed, 20 Sep 2017 18:54:34 +0000 (18:54 +0000)]
Merge "Add Telephony connection event for call forwarded supp service notice."
am: 9cc6286675

Change-Id: Ie7b6f251a29d1be706382e93f6f368fd8b8e1cc7

6 years agoMerge "Add Telephony connection event for call forwarded supp service notice."
Tyler Gunn [Wed, 20 Sep 2017 18:20:04 +0000 (18:20 +0000)]
Merge "Add Telephony connection event for call forwarded supp service notice."

6 years agoMerge "Fix STOPSHIP in SyncManager" into oc-mr1-dev
Makoto Onuki [Wed, 20 Sep 2017 17:33:20 +0000 (17:33 +0000)]
Merge "Fix STOPSHIP in SyncManager" into oc-mr1-dev
am: 80683fc983

Change-Id: Ie6135bbae0151fbcb30f8d797234aa7986bb98ad

6 years agoMerge "Fix STOPSHIP in SyncManager" into oc-mr1-dev
TreeHugger Robot [Wed, 20 Sep 2017 17:27:40 +0000 (17:27 +0000)]
Merge "Fix STOPSHIP in SyncManager" into oc-mr1-dev

6 years agoMerge "Fix random systemui crashes during boot" am: 8078996f4a -s ours am: 7b4087acdb
Jason Monk [Wed, 20 Sep 2017 17:10:30 +0000 (17:10 +0000)]
Merge "Fix random systemui crashes during boot" am: 8078996f4a  -s ours am: 7b4087acdb
am: f7aeee2ca5

Change-Id: Ib02b2f73f86d9678a53b717696232dd71bb0579f

6 years agoMerge "AudioService: reduce EU volume warning thresdhold for USB headsets am: 630f37a...
Android Build Merger (Role) [Wed, 20 Sep 2017 17:06:23 +0000 (17:06 +0000)]
Merge "AudioService: reduce EU volume warning thresdhold for USB headsets am: 630f37a4ad am: 94089cefe1" into oc-mr1-dev-plus-aosp

6 years agoAudioService: reduce EU volume warning thresdhold for USB headsets am: 630f37a4ad
Eric Laurent [Wed, 20 Sep 2017 17:03:35 +0000 (17:03 +0000)]
AudioService: reduce EU volume warning thresdhold for USB headsets am: 630f37a4ad
am: 94089cefe1

Change-Id: I996ef93c75788c4712f81278cb8ca7f59167e812

6 years agoAudioService: reduce EU volume warning thresdhold for USB headsets am: 630f37a4ad
Eric Laurent [Wed, 20 Sep 2017 17:02:15 +0000 (17:02 +0000)]
AudioService: reduce EU volume warning thresdhold for USB headsets am: 630f37a4ad
am: 0c4a9d2714

Change-Id: I9637e4b9e12908cee03f398c5ef91e89ea8e32e1

6 years agoAdd Telephony connection event for call forwarded supp service notice.
Tyler Gunn [Wed, 7 Jun 2017 22:42:39 +0000 (15:42 -0700)]
Add Telephony connection event for call forwarded supp service notice.

Test: Test Harness
Bug: 33761801
Merged-In: I5503232f90b3255df601be3f16443e8ae311a479
Change-Id: I8ffc8079b43c54594e596f29cec641ca051d4796

6 years agoMerge "Fix random systemui crashes during boot" am: 8078996f4a -s ours
Jason Monk [Wed, 20 Sep 2017 17:00:20 +0000 (17:00 +0000)]
Merge "Fix random systemui crashes during boot" am: 8078996f4a  -s ours
am: 7b4087acdb

Change-Id: Ib5f08316a5ae559fe8fab09601607e523bd32793

6 years agoAudioService: reduce EU volume warning thresdhold for USB headsets
Eric Laurent [Wed, 20 Sep 2017 16:54:47 +0000 (16:54 +0000)]
AudioService: reduce EU volume warning thresdhold for USB headsets
am: 630f37a4ad

Change-Id: Ied24bdcddc54255c3a287ffa871148177ad097f7

6 years agoAudioService: reduce EU volume warning thresdhold for USB headsets
Eric Laurent [Wed, 20 Sep 2017 16:54:43 +0000 (16:54 +0000)]
AudioService: reduce EU volume warning thresdhold for USB headsets
am: 630f37a4ad

Change-Id: Ib9a3ebae93073018fc4bda0d2dc36c5fc1fdac92

6 years agoMerge "Fix random systemui crashes during boot"
Jason Monk [Wed, 20 Sep 2017 16:53:13 +0000 (16:53 +0000)]
Merge "Fix random systemui crashes during boot"
am: 8078996f4a  -s ours

Change-Id: I97b1d904c2e37aff4ade169d0f76d7f0d123fc5b

6 years agoMerge "Fix compiler filter for downgrading unused apps" into oc-mr1-dev
Shubham Ajmera [Wed, 20 Sep 2017 16:29:15 +0000 (16:29 +0000)]
Merge "Fix compiler filter for downgrading unused apps" into oc-mr1-dev
am: 15f814e36e

Change-Id: Ia35c3ff6e3c8fd2af13604134051128747ba36e9

6 years agoMerge "packagemanager_native access to package installer, version" into oc-mr1-dev
Ray Essick [Wed, 20 Sep 2017 16:20:51 +0000 (16:20 +0000)]
Merge "packagemanager_native access to package installer, version" into oc-mr1-dev
am: 71ab6f6555

Change-Id: I552b7d549a129d1188db8ae6957ba7fb80149d0f

6 years agoMerge "Fix compiler filter for downgrading unused apps" into oc-mr1-dev
Shubham Ajmera [Wed, 20 Sep 2017 16:13:00 +0000 (16:13 +0000)]
Merge "Fix compiler filter for downgrading unused apps" into oc-mr1-dev

6 years agoMerge "packagemanager_native access to package installer, version" into oc-mr1-dev
Ray Essick [Wed, 20 Sep 2017 16:08:47 +0000 (16:08 +0000)]
Merge "packagemanager_native access to package installer, version" into oc-mr1-dev

6 years agoMerge "DND alert info set to INVISIBLE (not GONE) to retain formatting." into oc...
Beverly [Wed, 20 Sep 2017 16:07:47 +0000 (16:07 +0000)]
Merge "DND alert info set to INVISIBLE (not GONE) to retain formatting." into oc-mr1-dev
am: 8e84dfec6a

Change-Id: I779fde484505f8fd6e5a19397b670299970320c9

6 years agoMerge "DND alert info set to INVISIBLE (not GONE) to retain formatting." into oc...
TreeHugger Robot [Wed, 20 Sep 2017 16:02:46 +0000 (16:02 +0000)]
Merge "DND alert info set to INVISIBLE (not GONE) to retain formatting." into oc-mr1-dev

6 years agoMerge "Fix reliability triggering" into oc-mr1-dev
Neil Fuller [Wed, 20 Sep 2017 15:44:32 +0000 (15:44 +0000)]
Merge "Fix reliability triggering" into oc-mr1-dev
am: 36e5c8e7ed

Change-Id: Ib1ee3dae5b5b25a2ebdf1fea21d080cfbf506af2

6 years agoresolve merge conflicts of 83c367aa5b48 to stage-aosp-master am: 8acdb8aa65
Neil Fuller [Wed, 20 Sep 2017 15:39:37 +0000 (15:39 +0000)]
resolve merge conflicts of 83c367aa5b48 to stage-aosp-master am: 8acdb8aa65
am: 93fcfbc8cb  -s ours

Change-Id: I5eb5f54262cbcb38095ff5a6092c200c839e6987

6 years agoMerge "Fix reliability triggering" into oc-mr1-dev
Neil Fuller [Wed, 20 Sep 2017 15:36:47 +0000 (15:36 +0000)]
Merge "Fix reliability triggering" into oc-mr1-dev

6 years agoDe-couple data enabled from VT settings.
Tyler Gunn [Thu, 17 Aug 2017 22:58:47 +0000 (15:58 -0700)]
De-couple data enabled from VT settings.

The existing KEY_IGNORE_DATA_ENABLED_CHANGED_FOR_VIDEO_CALLS has the impact
of decoupling whether VT is enabled from whether mobile data is enabled.
Making this TRUE by default.
Adding a new carrier config option to indicate whether VILTE data is metered.
This, coupled with KEY_IGNORE_DATA_ENABLED_CHANGED_FOR_VIDEO_CALLS allows
us to ensure that wifi video calls can be made, while still ensuring that
mobile data is not used for VT calls.
A carrier config update needs to be made for the few instances where
KEY_IGNORE_DATA_ENABLED_CHANGED_FOR_VIDEO_CALLS was set true to ensure
that KEY_VILTE_DATA_IS_METERED_BOOL is false in that case.

Test: Manual
Bug: 36900451
Merged-In: I424cd828a7616c2947367bdb4a82a62cf17847e7
Change-Id: I037f8930901907b55e4245a655e0480668549185

6 years agoMerge "Fail gracefully if password reset token is invalidated" into oc-mr1-dev
Rubin Xu [Wed, 20 Sep 2017 15:28:29 +0000 (15:28 +0000)]
Merge "Fail gracefully if password reset token is invalidated" into oc-mr1-dev
am: 223a65f3f5

Change-Id: I3bba8e337fe57999daf1e7d8ff90a9f7bfc6831d

6 years agoMerge "Fail gracefully if password reset token is invalidated" into oc-mr1-dev
Rubin Xu [Wed, 20 Sep 2017 15:15:42 +0000 (15:15 +0000)]
Merge "Fail gracefully if password reset token is invalidated" into oc-mr1-dev

6 years agoresolve merge conflicts of 83c367aa5b48 to stage-aosp-master
Neil Fuller [Wed, 20 Sep 2017 14:55:08 +0000 (14:55 +0000)]
resolve merge conflicts of 83c367aa5b48 to stage-aosp-master
am: 8acdb8aa65

Change-Id: I7605323c886c9dafb83899c8b78e2bb860f96bb4

6 years agoMerge "Handle null left and right tab strip drawables" into oc-mr1-dev
Alan Viverette [Wed, 20 Sep 2017 14:09:01 +0000 (14:09 +0000)]
Merge "Handle null left and right tab strip drawables" into oc-mr1-dev
am: 286c7db342

Change-Id: I82092817d26af0a372923d238b9f84112f196ad2

6 years agoMerge "Handle null left and right tab strip drawables" into oc-mr1-dev
TreeHugger Robot [Wed, 20 Sep 2017 13:59:05 +0000 (13:59 +0000)]
Merge "Handle null left and right tab strip drawables" into oc-mr1-dev

6 years agoMerge "Fix random systemui crashes during boot"
Jason Monk [Wed, 20 Sep 2017 13:50:45 +0000 (13:50 +0000)]
Merge "Fix random systemui crashes during boot"

6 years agoTrack the earliest alarm for exiting DND.
Julia Reynolds [Tue, 19 Sep 2017 17:10:26 +0000 (13:10 -0400)]
Track the earliest alarm for exiting DND.

Test: manual
Change-Id: Ifa7ae6b6f3f8ff2c7cc8382ab73bf2bc89cd085e
Fixes: 65332502

6 years agoDND apps might not have a service, and that's ok
Julia Reynolds [Fri, 15 Sep 2017 18:26:32 +0000 (14:26 -0400)]
DND apps might not have a service, and that's ok

Also add logging for permission changes.

Bug: 64969998
Test: manual; trigger backup and verify dnd apps still have dnd
access.
Change-Id: Iefa14a6a1130fb4cc823fe6979f6b5a7b212ca4b

6 years agoresolve merge conflicts of 83c367aa5b48 to stage-aosp-master
Neil Fuller [Wed, 20 Sep 2017 12:43:28 +0000 (13:43 +0100)]
resolve merge conflicts of 83c367aa5b48 to stage-aosp-master

Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ia3dc2e0b10bbf5be9c7d8f98b03cf8030bbfff07

6 years agoMerge "Fix reliability triggering"
Treehugger Robot [Wed, 20 Sep 2017 12:08:58 +0000 (12:08 +0000)]
Merge "Fix reliability triggering"

6 years agoMerge "Remove StructGroupSourceReq" into oc-mr1-dev-plus-aosp
Victor Chang [Wed, 20 Sep 2017 09:33:23 +0000 (09:33 +0000)]
Merge "Remove StructGroupSourceReq" into oc-mr1-dev-plus-aosp

6 years agoMerge "Fix window visibility during layout" into oc-mr1-dev
Karthik Ravi Shankar [Wed, 20 Sep 2017 03:28:32 +0000 (03:28 +0000)]
Merge "Fix window visibility during layout" into oc-mr1-dev
am: 7a59a62276

Change-Id: Ic4726a77ce790616d50ff84edc35e7941b409659

6 years agoMerge "Partially revert ce54397368dc98182d7b4eb2ff3c142bbd87e39d" into oc-mr1-dev
Shubham Ajmera [Wed, 20 Sep 2017 03:18:33 +0000 (03:18 +0000)]
Merge "Partially revert ce54397368dc98182d7b4eb2ff3c142bbd87e39d" into oc-mr1-dev
am: 2cdfda1232

Change-Id: If3060eb7b21a3bb5f6b34b36de012cb35e4f03c9

6 years agoMerge "Fix window visibility during layout" into oc-mr1-dev
TreeHugger Robot [Wed, 20 Sep 2017 03:17:44 +0000 (03:17 +0000)]
Merge "Fix window visibility during layout" into oc-mr1-dev

6 years agoMerge "Partially revert ce54397368dc98182d7b4eb2ff3c142bbd87e39d" into oc-mr1-dev
TreeHugger Robot [Wed, 20 Sep 2017 03:11:22 +0000 (03:11 +0000)]
Merge "Partially revert ce54397368dc98182d7b4eb2ff3c142bbd87e39d" into oc-mr1-dev

6 years agoMerge "Select a system audio route only when needed" into oc-mr1-dev
Sungsoo Lim [Wed, 20 Sep 2017 03:02:28 +0000 (03:02 +0000)]
Merge "Select a system audio route only when needed" into oc-mr1-dev
am: d4aee713d4

Change-Id: Ifa91341cb48c970f9b19c6f8bc0219c1a3372a9a

6 years agoMerge "Select a system audio route only when needed" into oc-mr1-dev
TreeHugger Robot [Wed, 20 Sep 2017 02:54:45 +0000 (02:54 +0000)]
Merge "Select a system audio route only when needed" into oc-mr1-dev

6 years agohave OffloaderController store and re-push more state
Erik Kline [Tue, 19 Sep 2017 08:56:10 +0000 (17:56 +0900)]
have OffloaderController store and re-push more state

Test: as follows
    - built
    - flashed
    - booted
    - runtest frameworks-net passes
Bug: 29337859
Bug: 32163131
Bug: 64976634
Change-Id: Ib1421438a1e748722fc41f1fbfb01ada187bb1c8

6 years agoMerge changes Ied9d0cec,I3087f446,Ibe706872 into oc-mr1-dev
Hugo Benichi [Wed, 20 Sep 2017 01:05:15 +0000 (01:05 +0000)]
Merge changes Ied9d0cec,I3087f446,Ibe706872 into oc-mr1-dev
am: 14676c5da4

Change-Id: I34613d4e53c6cc33029e1f8030b0605100cc59fc

6 years agoMerge changes Ied9d0cec,I3087f446,Ibe706872 into oc-mr1-dev
Hugo Benichi [Wed, 20 Sep 2017 00:58:35 +0000 (00:58 +0000)]
Merge changes Ied9d0cec,I3087f446,Ibe706872 into oc-mr1-dev

* changes:
  Wakeup packet events: addressing a few comments
  Connectivity metrics: add WakeupStats events
  Connectivity metrics: collect NFLOG wakeup events

6 years agoMerge "Handle night display state when timezone changes" into oc-mr1-dev
Christine Franks [Wed, 20 Sep 2017 00:43:12 +0000 (00:43 +0000)]
Merge "Handle night display state when timezone changes" into oc-mr1-dev
am: 1276f357d3

Change-Id: I96cc0161eb092f2a965efbff4a417bc992493625

6 years agoMerge "Handle autofill auth scenarios where the FillContext cannot be retrieved:...
Felipe Leme [Wed, 20 Sep 2017 00:33:23 +0000 (00:33 +0000)]
Merge "Handle autofill auth scenarios where the FillContext cannot be retrieved:" into oc-mr1-dev
am: 5488a38465

Change-Id: I40b5124559da062bad0bdb9405aa89ef10d12597

6 years agoMerge "Merge "Handle showWhenLocked on secondary displays" into oc-mr1-dev am: 928219...
Android Build Merger (Role) [Wed, 20 Sep 2017 00:23:32 +0000 (00:23 +0000)]
Merge "Merge "Handle showWhenLocked on secondary displays" into oc-mr1-dev am: 9282193c84" into oc-mr1-dev-plus-aosp

6 years agoMerge "Handle night display state when timezone changes" into oc-mr1-dev
Christine Franks [Wed, 20 Sep 2017 00:23:28 +0000 (00:23 +0000)]
Merge "Handle night display state when timezone changes" into oc-mr1-dev

6 years agoMerge "Handle autofill auth scenarios where the FillContext cannot be retrieved:...
TreeHugger Robot [Wed, 20 Sep 2017 00:19:03 +0000 (00:19 +0000)]
Merge "Handle autofill auth scenarios where the FillContext cannot be retrieved:" into oc-mr1-dev

6 years agoMerge "Handle showWhenLocked on secondary displays" into oc-mr1-dev
David Stevens [Wed, 20 Sep 2017 00:18:26 +0000 (00:18 +0000)]
Merge "Handle showWhenLocked on secondary displays" into oc-mr1-dev
am: 9282193c84

Change-Id: Idbd4d3f24dffaad11518dd3d4d16ca7c7137ee94

6 years agoMerge "Fix wrong reading the sms lengh of stored long sms in RUIM" am: c8ad4a82c7...
Jordan Liu [Wed, 20 Sep 2017 00:12:10 +0000 (00:12 +0000)]
Merge "Fix wrong reading the sms lengh of stored long sms in RUIM" am: c8ad4a82c7 am: 649f3bf73f
am: 56ed1f9c9d

Change-Id: I039843725244d892248591cf4e88e1840e506733

6 years agoMerge "Handle showWhenLocked on secondary displays" into oc-mr1-dev
David Stevens [Wed, 20 Sep 2017 00:09:04 +0000 (00:09 +0000)]
Merge "Handle showWhenLocked on secondary displays" into oc-mr1-dev

6 years agoMerge "Fix wrong reading the sms lengh of stored long sms in RUIM" am: c8ad4a82c7
Jordan Liu [Wed, 20 Sep 2017 00:04:56 +0000 (00:04 +0000)]
Merge "Fix wrong reading the sms lengh of stored long sms in RUIM" am: c8ad4a82c7
am: 649f3bf73f

Change-Id: If8b12685886ccbdecdb4e123629edc4e3426711d

6 years agoMerge "Fix wrong reading the sms lengh of stored long sms in RUIM"
Jordan Liu [Tue, 19 Sep 2017 23:55:48 +0000 (23:55 +0000)]
Merge "Fix wrong reading the sms lengh of stored long sms in RUIM"
am: c8ad4a82c7

Change-Id: Id1af6c8abd901f981ad1abfa5fbf4887ee694c17

6 years agoMerge "Fix wrong reading the sms lengh of stored long sms in RUIM"
Jordan Liu [Tue, 19 Sep 2017 23:39:42 +0000 (23:39 +0000)]
Merge "Fix wrong reading the sms lengh of stored long sms in RUIM"

6 years agoMerge "Consider task's root activity when determining if resizable." into oc-mr1-dev
Bryce Lee [Tue, 19 Sep 2017 23:32:17 +0000 (23:32 +0000)]
Merge "Consider task's root activity when determining if resizable." into oc-mr1-dev
am: 1c2a6921c0

Change-Id: I06e858733e21220b6008bd55c2d4119bc51cd2cd

6 years agoMerge "Consider task's root activity when determining if resizable." into oc-mr1-dev
Bryce Lee [Tue, 19 Sep 2017 23:21:54 +0000 (23:21 +0000)]
Merge "Consider task's root activity when determining if resizable." into oc-mr1-dev

6 years agoConsider task's root activity when determining if resizable.
Bryce Lee [Fri, 15 Sep 2017 00:06:41 +0000 (17:06 -0700)]
Consider task's root activity when determining if resizable.

We consider an activity resizable if the root activity of the its
parent task is resizable. This changelist adds this condition to
consideration.

Change-Id: I4162ff7eb6cad3f4a3f9fdf35ccc0b0d2383ff15
Fixes: 65668913
Test: bit FrameworksServicesTests:com.android.server.am.ActivityRecordTests#testCanBeLaunchedOnDisplay
Test: cts/hostsidetests/services/activityandwindowmanager/util/run-test CtsServicesHostTestCases android.server.cts.ActivityManagerDisplayTests#testLaunchNonResizeableActivityFromSecondaryDisplaySameTask

6 years agoMerge "Autofill optimization: don't contact server when session is finished." into...
Felipe Leme [Tue, 19 Sep 2017 23:01:33 +0000 (23:01 +0000)]
Merge "Autofill optimization: don't contact server when session is finished." into oc-mr1-dev
am: 2748ffcef7

Change-Id: I912d263f40e3d1cc58c77f2a91c585bb97aa3c37

6 years agoMerge "Autofill optimization: don't contact server when session is finished." into...
TreeHugger Robot [Tue, 19 Sep 2017 22:47:16 +0000 (22:47 +0000)]
Merge "Autofill optimization: don't contact server when session is finished." into oc-mr1-dev

6 years agoMerge "Deferred setup banner updates intermittently" into oc-mr1-dev
Ajay Nadathur [Tue, 19 Sep 2017 22:26:00 +0000 (22:26 +0000)]
Merge "Deferred setup banner updates intermittently" into oc-mr1-dev
am: 19e00be16b

Change-Id: I2ba4882632e59141c9b1de697928d5a3a7a413fc

6 years agoMerge "Fix dexopt dump" into oc-mr1-dev
Calin Juravle [Tue, 19 Sep 2017 22:17:53 +0000 (22:17 +0000)]
Merge "Fix dexopt dump" into oc-mr1-dev
am: 479af339de

Change-Id: I1ce2dd66298058e26e623ed39eec413575a10a7c

6 years agoMerge "Deferred setup banner updates intermittently" into oc-mr1-dev
TreeHugger Robot [Tue, 19 Sep 2017 22:13:28 +0000 (22:13 +0000)]
Merge "Deferred setup banner updates intermittently" into oc-mr1-dev

6 years agoMerge "Add an explicit reason for the compilation of shared apks" into oc-mr1-dev
Calin Juravle [Tue, 19 Sep 2017 22:09:56 +0000 (22:09 +0000)]
Merge "Add an explicit reason for the compilation of shared apks" into oc-mr1-dev
am: d78d269650

Change-Id: I18243e9c77c921d5b860ccfe4bb021e21e8bb5e7

6 years agoMerge "Fix dexopt dump" into oc-mr1-dev
Calin Juravle [Tue, 19 Sep 2017 21:58:14 +0000 (21:58 +0000)]
Merge "Fix dexopt dump" into oc-mr1-dev

6 years agoMerge "Add an explicit reason for the compilation of shared apks" into oc-mr1-dev
Calin Juravle [Tue, 19 Sep 2017 21:56:41 +0000 (21:56 +0000)]
Merge "Add an explicit reason for the compilation of shared apks" into oc-mr1-dev

6 years agoPartially revert ce54397368dc98182d7b4eb2ff3c142bbd87e39d
Shubham Ajmera [Tue, 19 Sep 2017 21:07:05 +0000 (14:07 -0700)]
Partially revert ce54397368dc98182d7b4eb2ff3c142bbd87e39d

We have already reverted A/B dexopt for secondary dex files in commit
7c1471197427b59f99578fd2483b1e113ba4b7f1. This removes secondary dex
opt during boot after OTA.

Bug: 65067046
Test: make and boot.
Change-Id: I76009ed609a608e009a50860b53a8dfed9d57334

6 years agoHandle night display state when timezone changes
Christine Franks [Fri, 25 Aug 2017 20:57:26 +0000 (13:57 -0700)]
Handle night display state when timezone changes

Bug: 64458884
Test: runtest -c com.android.server.NightDisplayServiceTest \
frameworks-services and manually tested Hawaii and London

Change-Id: I052034a4c64eb73c42672215e8847c11e00efeb5

6 years agoMerge "Do not pause scanning during Network state changes." into oc-mr1-dev
Sundeep Ghuman [Tue, 19 Sep 2017 21:01:55 +0000 (21:01 +0000)]
Merge "Do not pause scanning during Network state changes." into oc-mr1-dev
am: 7b911fbdaf

Change-Id: I9f75901dcbaace37a44971a0e2b2dba02dedfa00

6 years agoFix compiler filter for downgrading unused apps
Shubham Ajmera [Tue, 19 Sep 2017 04:13:59 +0000 (21:13 -0700)]
Fix compiler filter for downgrading unused apps

Bug: 65861247
Test: Verified manually that dex files are getting downgraded for \
       unused packages.

Change-Id: Ice2b111ab5bfd231a592ac5ed416362b95d27e8a

6 years agoMerge "Do not pause scanning during Network state changes." into oc-mr1-dev
TreeHugger Robot [Tue, 19 Sep 2017 20:52:49 +0000 (20:52 +0000)]
Merge "Do not pause scanning during Network state changes." into oc-mr1-dev

6 years agoMerge "Remove all FATAL_IFs from graphicsstats service" into oc-mr1-dev
John Reck [Tue, 19 Sep 2017 20:48:24 +0000 (20:48 +0000)]
Merge "Remove all FATAL_IFs from graphicsstats service" into oc-mr1-dev
am: 879a9677b9

Change-Id: I62eeec65e62e5f4d422b95847b7bbab93e1a4fbe

6 years agoMerge "Adds handle to NanoAppInstanceInfo Parcel" into oc-mr1-dev
Arthur Ishiguro [Tue, 19 Sep 2017 20:42:28 +0000 (20:42 +0000)]
Merge "Adds handle to NanoAppInstanceInfo Parcel" into oc-mr1-dev
am: 0853fe8a53

Change-Id: Icefb1d6d21bcebfc5b16e5ec234c9f1c6043717f

6 years agoMerge "Remove all FATAL_IFs from graphicsstats service" into oc-mr1-dev
TreeHugger Robot [Tue, 19 Sep 2017 20:33:25 +0000 (20:33 +0000)]
Merge "Remove all FATAL_IFs from graphicsstats service" into oc-mr1-dev

6 years agoMerge "Adds handle to NanoAppInstanceInfo Parcel" into oc-mr1-dev
TreeHugger Robot [Tue, 19 Sep 2017 20:32:56 +0000 (20:32 +0000)]
Merge "Adds handle to NanoAppInstanceInfo Parcel" into oc-mr1-dev

6 years agoMerge "Mark uid as non-idle/FG-entitled when launching for fg service" into oc-mr1-dev
Christopher Tate [Tue, 19 Sep 2017 20:04:35 +0000 (20:04 +0000)]
Merge "Mark uid as non-idle/FG-entitled when launching for fg service" into oc-mr1-dev
am: 93243bf808

Change-Id: Ibb5a539d306c58a21844ff97e0ac2678dd55c8e3

6 years agoMerge "Mark uid as non-idle/FG-entitled when launching for fg service" into oc-mr1-dev
TreeHugger Robot [Tue, 19 Sep 2017 19:50:42 +0000 (19:50 +0000)]
Merge "Mark uid as non-idle/FG-entitled when launching for fg service" into oc-mr1-dev

6 years agoConvert ICarrierService to oneway.
Jonathan Basseri [Tue, 25 Jul 2017 20:34:36 +0000 (13:34 -0700)]
Convert ICarrierService to oneway.

Change the carrier config AIDL used by CarrierService to a oneway call.
This is the IPC used to fetch carrier config bundles from carrier apps.
Converting to oneway allows CarrierConfigLoader to be non-blocking while
it fetches config.

Bug: 63176442
Test: runtest carrierconfig-unit & manual
Change-Id: Iceaf0446321f719011f67897398da7d5998c5fc7

6 years agoDND alert info set to INVISIBLE (not GONE) to retain formatting.
Beverly [Tue, 19 Sep 2017 18:56:58 +0000 (14:56 -0400)]
DND alert info set to INVISIBLE (not GONE) to retain formatting.

Change-Id: I182aed5f48d4c2a935a7bfbb9a240046b27dea58
Fixes: 64688590
Test: Manual based on repro steps

6 years agoMerge "Fix AddAccountSettings memory leak" am: 104501fa29 am: c17b4e5a14
Fyodor Kupolov [Tue, 19 Sep 2017 18:56:45 +0000 (18:56 +0000)]
Merge "Fix AddAccountSettings memory leak" am: 104501fa29 am: c17b4e5a14
am: 80e87f97c3

Change-Id: Iff2f6a0dff9774d155961aafade36eeb5db5bc81

6 years agoAutofill optimization: don't contact server when session is finished.
Felipe Leme [Tue, 19 Sep 2017 16:06:20 +0000 (09:06 -0700)]
Autofill optimization: don't contact server when session is finished.

Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases
Bug: 65414762

Change-Id: I214a7835727c3ff71de9dc65c8d6fe54507265fb

6 years agoMerge "Fix AddAccountSettings memory leak" am: 104501fa29
Fyodor Kupolov [Tue, 19 Sep 2017 18:48:54 +0000 (18:48 +0000)]
Merge "Fix AddAccountSettings memory leak" am: 104501fa29
am: c17b4e5a14

Change-Id: Ie7dd4310f3937c2c3e0fc9d3590b1a7813c0abee