OSDN Git Service
Eric Laurent [Thu, 21 Sep 2017 03:17:52 +0000 (03:17 +0000)]
AudioService: reduce EU volume warning thresdhold for USB headsets am:
630f37a4ad am:
0c4a9d2714
am:
31e86f44a0
Change-Id: If2b8d0875760ff45a2a2039ee08d786b95f67c2b
Shubham Ajmera [Thu, 21 Sep 2017 03:14:27 +0000 (03:14 +0000)]
Merge "Fix compiler filter for downgrading unused apps" into oc-mr1-dev am:
15f814e36e
am:
9f2baf1853
Change-Id: I7295e91cdcc8dbe3251b3ab93add1e26207c703c
Android Build Merger (Role) [Thu, 21 Sep 2017 03:09:59 +0000 (03:09 +0000)]
Merge "Merge "packagemanager_native access to package installer, version" into oc-mr1-dev am:
71ab6f6555 am:
81799dce0b"
Ray Essick [Thu, 21 Sep 2017 03:06:34 +0000 (03:06 +0000)]
Merge "packagemanager_native access to package installer, version" into oc-mr1-dev am:
71ab6f6555
am:
81799dce0b
Change-Id: Iab1d843e997854747b1275991c7a3a6cf5a1fc03
Android Build Merger (Role) [Thu, 21 Sep 2017 03:04:38 +0000 (03:04 +0000)]
Merge "Merge "DND alert info set to INVISIBLE (not GONE) to retain formatting." into oc-mr1-dev am:
8e84dfec6a am:
3cc49656fb"
Beverly [Thu, 21 Sep 2017 03:03:01 +0000 (03:03 +0000)]
Merge "DND alert info set to INVISIBLE (not GONE) to retain formatting." into oc-mr1-dev am:
8e84dfec6a
am:
3cc49656fb
Change-Id: I1f07fe09251a88fec1e466bbd52e8c053a1601b2
Android Build Merger (Role) [Thu, 21 Sep 2017 03:02:25 +0000 (03:02 +0000)]
Merge "Merge "Fix reliability triggering" into oc-mr1-dev am:
36e5c8e7ed am:
5bd0a22243"
Neil Fuller [Thu, 21 Sep 2017 03:00:11 +0000 (03:00 +0000)]
Merge "Fix reliability triggering" into oc-mr1-dev am:
36e5c8e7ed
am:
5bd0a22243
Change-Id: I5258375c803332b49bf21f7c161eda13054c81b7
Android Build Merger (Role) [Thu, 21 Sep 2017 02:59:27 +0000 (02:59 +0000)]
Merge "resolve merge conflicts of
83c367aa5b48 to stage-aosp-master am:
8acdb8aa65 am:
93fcfbc8cb -s ours am:
2540844f6d"
TreeHugger Robot [Thu, 21 Sep 2017 02:59:06 +0000 (02:59 +0000)]
Merge "Pass text direction from DynamicLayout to Layout"
Neil Fuller [Thu, 21 Sep 2017 02:54:31 +0000 (02:54 +0000)]
resolve merge conflicts of
83c367aa5b48 to stage-aosp-master am:
8acdb8aa65 am:
93fcfbc8cb -s ours
am:
2540844f6d
Change-Id: I6fc02e2e892aa101afc2f77a89f27d518886e638
Rubin Xu [Thu, 21 Sep 2017 02:52:03 +0000 (02:52 +0000)]
Merge "Fail gracefully if password reset token is invalidated" into oc-mr1-dev am:
223a65f3f5
am:
656c519dd7
Change-Id: I8c55be53d2a3bc53e5f003db61a5d78dd49c053c
Android Build Merger (Role) [Thu, 21 Sep 2017 01:51:14 +0000 (01:51 +0000)]
Merge "Merge "Handle null left and right tab strip drawables" into oc-mr1-dev am:
286c7db342 am:
7dbf5b032b"
Alan Viverette [Thu, 21 Sep 2017 01:46:55 +0000 (01:46 +0000)]
Merge "Handle null left and right tab strip drawables" into oc-mr1-dev am:
286c7db342
am:
7dbf5b032b
Change-Id: I5c3f616276f1f68a134c48f886cc43d282400415
TreeHugger Robot [Thu, 21 Sep 2017 01:45:20 +0000 (01:45 +0000)]
Merge "Statsd namespace is defined and used"
Victor Chang [Thu, 21 Sep 2017 01:43:19 +0000 (01:43 +0000)]
Merge "Remove StructGroupSourceReq" into oc-mr1-dev-plus-aosp
am:
ea8a114743
Change-Id: Ie44da7ca28665a0769da7a1d7231d02cf4942c5d
Karthik Ravi Shankar [Thu, 21 Sep 2017 01:38:23 +0000 (01:38 +0000)]
Merge "Fix window visibility during layout" into oc-mr1-dev am:
7a59a62276
am:
11f25ba1a0
Change-Id: I3620a51554e6e8101d5a013f9287339bb1031806
TreeHugger Robot [Thu, 21 Sep 2017 01:04:06 +0000 (01:04 +0000)]
Merge "Changed reparentChild method name to reparent."
TreeHugger Robot [Thu, 21 Sep 2017 00:50:47 +0000 (00:50 +0000)]
Merge "Convert ActivityManager dumpsys to protobuf"
Fyodor Kupolov [Thu, 21 Sep 2017 00:04:11 +0000 (00:04 +0000)]
Merge "Dump total execution time per connection pool"
TreeHugger Robot [Wed, 20 Sep 2017 23:58:32 +0000 (23:58 +0000)]
Merge "Divide dumpsys services into different buckets"
Bookatz [Wed, 20 Sep 2017 22:26:44 +0000 (15:26 -0700)]
Statsd namespace is defined and used
Statsd code now lives in android::os::statsd namespace. Existing files
are largely modified to follow this convention.
Exception: parse_util, since it seems a bit different.
Test: code compiles and existing statsd_tests still pass
Change-Id: Idf92a071b9ed172d01eb3087a4fa3609d67a038c
Robert Quattlebaum [Tue, 15 Aug 2017 01:34:03 +0000 (18:34 -0700)]
Ensure lowpan UID can manage LoWPAN interfaces
Bug: b/
64399805
Change-Id: Idd0bd7ef0c4de48c95699efc43324bc4dce8e70a
Roozbeh Pournader [Wed, 20 Sep 2017 23:07:13 +0000 (16:07 -0700)]
Pass text direction from DynamicLayout to Layout
Previously, we were calling the wrong constructor for Layout, which
didn't have a text direction.
Bug:
65330510
Test: bit FrameworksCoreTests:android.widget.EditorCursorTest
Test: bit FrameworksCoreTests:android.text.DynamicLayoutTest
Test: bit CtsTextTestCases:android.text.cts.DynamicLayoutTest
Change-Id: Idf0ac781dc8d6641184b7deabe990cd0e451ad26
TreeHugger Robot [Wed, 20 Sep 2017 23:11:13 +0000 (23:11 +0000)]
Merge "statsd & statscompanion communication more robust"
Vishnu Nair [Wed, 13 Sep 2017 17:41:28 +0000 (10:41 -0700)]
Divide dumpsys services into different buckets
cpuinfo dumps all on dumpCritical
meminfo dumps all dumpNormal (temp)
activity dumps activities on dumpCritical, dumps all on normal
window dumps all on dumpCritical
BUG:
31774394
Test: adb bugreport > /tmp/bugreport.zip
Test: frameworks/base/services/tests/runtests.py -e class
"com.android.server.utils.PriorityDumpTest"
Change-Id: I529a709ec8654d314515ebd559894b4eacdc8968
TreeHugger Robot [Wed, 20 Sep 2017 21:30:13 +0000 (21:30 +0000)]
Merge "Add start margin to preference icon."
Bookatz [Mon, 18 Sep 2017 18:26:01 +0000 (11:26 -0700)]
statsd & statscompanion communication more robust
If statsd or statsdcompanion crashes, or if one loads
before the other, the other will be able to accomodate.
When statsd loads, it will attempt to tell statscompanion that it's
alive, and then get on to its business, while assuming that
statscompanion is not alive. Only when statscompanion tells statsd
that it is alive, statsd will then start to use it.
When statscompanion loads, it will attempt to tell statsd that it's
alive and then do nothing (since it has nothing to do). When statsd
tells statscompanion that statsd is alive, statscompanion will respond,
telling statsd that it is alive and, if that binder call returns, will
get to work.
This way, if statsd loads first, it can work unobstructed until
statscompanion informs statsd that it is alive, at which point they
shake hands and work. Conversely, if statscompanion loads first, it will
do nothing until statsd contacts it, at which point they will shake
hands and work.
Test: manual
Change-Id: I969ad47fb8060e27814d05ad37433a02711cfa6a
TreeHugger Robot [Wed, 20 Sep 2017 21:13:07 +0000 (21:13 +0000)]
Merge "StatsCompanionService sends messages to statsd"
TreeHugger Robot [Wed, 20 Sep 2017 20:47:06 +0000 (20:47 +0000)]
Merge "incidentd: fix memory leaks in a test"
Jeffrey Huang [Wed, 20 Sep 2017 20:27:08 +0000 (20:27 +0000)]
Merge "Add metric for oem unlock dialog"
Doris Ling [Wed, 20 Sep 2017 18:38:40 +0000 (11:38 -0700)]
Add start margin to preference icon.
We would like to align the preference icon with the back button above.
Adding the start margin for the icon frame, so that it will be
placed further to the right.
Fixes:
64696037
Test: visual
Change-Id: I3fbcd40fea40bf5a41c1e4281a559e4012664266
Steven Timotius [Tue, 12 Sep 2017 18:07:21 +0000 (11:07 -0700)]
Convert ActivityManager dumpsys to protobuf
Also adding ActivityInfo.RESIZE_MODE_RESIZEABLE to TestApi
Test: cts-tradefed run commandAndExit cts-dev --module CtsActivityManagerDeviceTestCases
Change-Id: I958aa155b266799840ece1ca07feed8593724449
Mike Reed [Wed, 20 Sep 2017 17:17:54 +0000 (17:17 +0000)]
Merge "switch to unique_ptr version of Skia stream api"
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
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
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
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
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
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
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
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
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
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
Neil Fuller [Wed, 20 Sep 2017 15:36:47 +0000 (15:36 +0000)]
Merge "Fix reliability triggering" into oc-mr1-dev
chaviw [Mon, 18 Sep 2017 23:50:05 +0000 (16:50 -0700)]
Changed reparentChild method name to reparent.
The native reparentChild was changed to reparent to represent that the
current layer is getting re-parented. Updated the jni and Java code to
reflect that.
Test: Device boots
Change-Id: I390d2efba61c626f2162f75f650700d53ab178a5
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
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
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
Bookatz [Fri, 8 Sep 2017 18:58:42 +0000 (11:58 -0700)]
StatsCompanionService sends messages to statsd
StatsCompanionService can now inform statsd that an alarm (for anomaly
alerting and for polling) has fired, so that statsd can act accordingly.
Test: manual created an alarm from statsd.main and checked logcat that
statsd received the broadcast that it fired
Change-Id: I1d33dfbee0d3e213c91dd6973d2622ecacc890c8
Richard Coles [Wed, 20 Sep 2017 14:38:25 +0000 (14:38 +0000)]
Merge "Consider shared libs when precreating WebView classloader."
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
Adam Bookatz [Wed, 20 Sep 2017 14:01:49 +0000 (14:01 +0000)]
Merge changes I82fe220e,Iff324c73,I3bd73acd
* changes:
indexed priority queue for AnomalyMonitor
StatsCompanionService connection to Statsd
Set up StatsCompanionService.java
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
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
Treehugger Robot [Wed, 20 Sep 2017 12:08:58 +0000 (12:08 +0000)]
Merge "Fix reliability triggering"
Shubham Ajmera [Wed, 20 Sep 2017 10:03:23 +0000 (10:03 +0000)]
Merge "Partially revert
ce54397368dc98182d7b4eb2ff3c142bbd87e39d" into oc-mr1-dev am:
2cdfda1232
am:
d4083dc339
Change-Id: Ic4b97b9d378f379bfbc00c6d2566c1712a2edf07
Sungsoo Lim [Wed, 20 Sep 2017 09:57:47 +0000 (09:57 +0000)]
Merge "Select a system audio route only when needed" into oc-mr1-dev am:
d4aee713d4
am:
cf874bbe6f
Change-Id: I79a44736931cea34eb6d00a62ae33b569021e9e4
Hugo Benichi [Wed, 20 Sep 2017 09:50:32 +0000 (09:50 +0000)]
Merge changes Ied9d0cec,I3087f446,Ibe706872 into oc-mr1-dev am:
14676c5da4
am:
b7de1a86b5
Change-Id: I1797f0c7ad3ddd7d6f509c093f9a16f007a7fe5d
Christine Franks [Wed, 20 Sep 2017 09:44:34 +0000 (09:44 +0000)]
Merge "Handle night display state when timezone changes" into oc-mr1-dev am:
1276f357d3
am:
1cdb151ef7
Change-Id: Ibb9931592abf7c8c8743fd52872ae6fed785a992
Victor Chang [Wed, 20 Sep 2017 09:33:23 +0000 (09:33 +0000)]
Merge "Remove StructGroupSourceReq" into oc-mr1-dev-plus-aosp
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
(cherry picked from commit
2ce862c3ed3739c4bb794794fb57e00fe233a3d5)
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
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
TreeHugger Robot [Wed, 20 Sep 2017 03:17:44 +0000 (03:17 +0000)]
Merge "Fix window visibility during layout" 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
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
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
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
Felipe Leme [Wed, 20 Sep 2017 00:59:11 +0000 (00:59 +0000)]
Merge "Handle autofill auth scenarios where the FillContext cannot be retrieved:" into oc-mr1-dev am:
5488a38465
am:
3ac60cbbe0
Change-Id: Ia59feec4ad1a442f6ade75eab8f3e49946d9f11b
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
David Stevens [Wed, 20 Sep 2017 00:50:48 +0000 (00:50 +0000)]
Merge "Merge "Handle showWhenLocked on secondary displays" into oc-mr1-dev am:
9282193c84" into oc-mr1-dev-plus-aosp
am:
ffdeee01ed
Change-Id: I8a03b9a31b27b88e10f64a4707e010b1db7945ca
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
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
Jordan Liu [Wed, 20 Sep 2017 00:24:00 +0000 (00:24 +0000)]
Merge "Fix wrong reading the sms lengh of stored long sms in RUIM" am:
c8ad4a82c7 am:
649f3bf73f am:
56ed1f9c9d
am:
2869e57522
Change-Id: I5e70bd06ae409eb17989a3767b862d997d04cda2
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
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
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
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
TreeHugger Robot [Wed, 20 Sep 2017 00:18:07 +0000 (00:18 +0000)]
Merge "Delete unused interface IAM.swapDockedAndFullscreenStack()"
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
TreeHugger Robot [Wed, 20 Sep 2017 00:09:09 +0000 (00:09 +0000)]
Merge "ActivityOptions.set/getLaunchStackId() be gone!"
David Stevens [Wed, 20 Sep 2017 00:09:04 +0000 (00:09 +0000)]
Merge "Handle showWhenLocked on secondary displays" into oc-mr1-dev
Philip Quinn [Mon, 18 Sep 2017 16:47:48 +0000 (09:47 -0700)]
Add HeadsUpManager as a SystemUI dependency.
Bug:
65849819
Test: make -j
Change-Id: Id4386aa267c512b9828480d42214b51093e73587
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
Daniel Sandler [Wed, 20 Sep 2017 00:04:51 +0000 (00:04 +0000)]
Merge "OWNERS files don't really work with groups yet."
Dan Sandler [Tue, 19 Sep 2017 23:38:18 +0000 (19:38 -0400)]
OWNERS files don't really work with groups yet.
Test: n/a
Exempt-From-Owner-Approval: for obvious reasons
Change-Id: Ie41fbae528fa213e092411b38dda5a84b1288b22
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
George Burgess IV [Tue, 19 Sep 2017 23:36:02 +0000 (16:36 -0700)]
incidentd: fix memory leaks in a test
The static analyzer found many memory leaks in this file. Converting
everything to use unique_ptr became really ugly, and involved lots of
copying from lists of unique_ptr<Privacy> to lists of Privacy*. Since
these tests really don't seem to allocate much, freeing everything en
masse at the end should be good enough.
Bug:
27101951
Test: mma; memory leak warnings are gone. Running
/data/nativetest64/incidentd_test/incidentd_test shows no failures.
Change-Id: I151b7ef4e02ee736e4e833924c0500e8dbedcc49
Bryce Lee [Tue, 19 Sep 2017 23:41:16 +0000 (23:41 +0000)]
Merge "Consider task's root activity when determining if resizable." into oc-mr1-dev am:
1c2a6921c0
am:
dbb33c058b
Change-Id: If3caf66edc965a46df24e2aaf4e73b83aebcbf67
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"
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
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
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
Felipe Leme [Tue, 19 Sep 2017 23:12:44 +0000 (23:12 +0000)]
Merge "Autofill optimization: don't contact server when session is finished." into oc-mr1-dev am:
2748ffcef7
am:
667fb12d37
Change-Id: Ib4d8b85be3d38131d606569913939d10199c63f7
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
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
Ajay Nadathur [Tue, 19 Sep 2017 22:37:44 +0000 (22:37 +0000)]
Merge "Deferred setup banner updates intermittently" into oc-mr1-dev am:
19e00be16b
am:
f4f1c4d425
Change-Id: I0045019061b59d08e576a0c343f694804668870a
Calin Juravle [Tue, 19 Sep 2017 22:30:03 +0000 (22:30 +0000)]
Merge "Fix dexopt dump" into oc-mr1-dev am:
479af339de
am:
97de54bdda
Change-Id: Iaeb4ce6d248ae988ffd68a609bb572d600bc1698
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
OSDN Git Service
