Andreas Gampe
79ac25b589
Settings: Remove SamplingProfiler vestiges
...
The sampling profiler has been removed.
Bug: 63118033
Test: m
Change-Id: I7762cd586de7919d0853067154db19aa3e6fa80b
2017-07-24 15:28:39 -07:00
TreeHugger Robot
1e2df08ade
Merge "Define constants for ellipsize values"
2017-07-24 21:24:38 +00:00
Felipe Leme
fd068d322a
Merge "Don't create WindowNode on windows with dettached view." into oc-mr1-dev am: 70c72263ac
...
am: 2c358c08ef
2017-07-24 20:57:09 +00:00
Felipe Leme
2c358c08ef
Merge "Don't create WindowNode on windows with dettached view." into oc-mr1-dev
...
am: 70c72263ac
2017-07-24 20:35:05 +00:00
TreeHugger Robot
70c72263ac
Merge "Don't create WindowNode on windows with dettached view." into oc-mr1-dev
2017-07-24 20:21:15 +00:00
Makoto Onuki
a1422523bc
Merge "Don't keep parceled extras for history broadcasts." into oc-mr1-dev am: 4fdefef7a1
...
am: f880d1f9af
2017-07-24 18:07:58 +00:00
Makoto Onuki
f880d1f9af
Merge "Don't keep parceled extras for history broadcasts." into oc-mr1-dev
...
am: 4fdefef7a1
2017-07-24 17:54:26 +00:00
Makoto Onuki
4fdefef7a1
Merge "Don't keep parceled extras for history broadcasts." into oc-mr1-dev
2017-07-24 17:42:31 +00:00
TreeHugger Robot
a404b8ad84
Merge "Docs: Note that DISALLOW_CONFIG_VPN stops VPNs from starting"
2017-07-24 17:38:47 +00:00
Roozbeh Pournader
3f9cfa77d8
Define constants for ellipsize values
...
Also remove an already-done TODO item.
Test: bit CtsTextTestCases:*
Test: bit CtsWidgetTestCases:android.widget.cts.TextViewTest
Test: bit CtsWidgetTestCases:android.widget.cts.EditTextTest
Test: bit CtsWidgetTestCases:android.widget.cts.CheckedTextViewTest
Test: bit CtsWidgetTestCases:android.widget.cts.AutoCompleteTextViewTest
Test: bit CtsWidgetTestCases:android.widget.cts.MultiAutoCompleteTextViewTest
Test: adb shell am instrument -w -e package android.text com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner
Change-Id: I0c91ac3ad4ab5794c1e36f1f5e576d52acad66b2
2017-07-24 10:05:59 -07:00
Michael Wright
87fd229db3
Merge "Remove non-safe mode boot vibration." into oc-dr1-dev am: 149ff697ff am: d487520e4c
...
am: 0d0eb6ba09
2017-07-24 13:11:32 +00:00
Michael Wright
0d0eb6ba09
Merge "Remove non-safe mode boot vibration." into oc-dr1-dev am: 149ff697ff
...
am: d487520e4c
2017-07-24 13:01:33 +00:00
Michael Wright
d487520e4c
Merge "Remove non-safe mode boot vibration." into oc-dr1-dev
...
am: 149ff697ff
2017-07-24 12:52:43 +00:00
TreeHugger Robot
149ff697ff
Merge "Remove non-safe mode boot vibration." into oc-dr1-dev
2017-07-24 12:46:25 +00:00
Benjamin Miller
1f83e4d498
Docs: Note that DISALLOW_CONFIG_VPN stops VPNs from starting
...
VPNs don't start except a DPC's configured always-on VPN. Clarified version behaviors.
Staged at: go/dac-stage/reference/android/os/UserManager.html#DISALLOW_CONFIG_VPN
Test: make ds-docs and output staged UserManager page
Bug: 63582789
Change-Id: I83c0c6cc580b9d1d224a94e073f559f23cf4d672
2017-07-24 12:59:42 +02:00
Selim Cinek
c7dbc7993e
Merge "Removing contents hidden string for public notifications" into oc-dr1-dev am: 8650c7c0f1 am: 001956c626
...
am: 137123bdef
2017-07-23 13:11:23 +00:00
Selim Cinek
137123bdef
Merge "Removing contents hidden string for public notifications" into oc-dr1-dev am: 8650c7c0f1
...
am: 001956c626
2017-07-23 13:04:49 +00:00
Selim Cinek
001956c626
Merge "Removing contents hidden string for public notifications" into oc-dr1-dev
...
am: 8650c7c0f1
2017-07-23 12:57:20 +00:00
Selim Cinek
3a82a4a0f2
Merge "Removing contents hidden string for public notifications" into oc-dr1-dev
...
am: 8650c7c0f1
2017-07-23 12:57:19 +00:00
TreeHugger Robot
8650c7c0f1
Merge "Removing contents hidden string for public notifications" into oc-dr1-dev
2017-07-23 12:51:43 +00:00
Romain Guy
49345e6cb5
Merge "Expose shared buffer mode/auto refresh on Surface" into oc-mr1-dev am: 572cb5242d
...
am: 99a05a108d
2017-07-22 03:14:31 +00:00
Romain Guy
99a05a108d
Merge "Expose shared buffer mode/auto refresh on Surface" into oc-mr1-dev
...
am: 572cb5242d
2017-07-22 03:08:29 +00:00
TreeHugger Robot
572cb5242d
Merge "Expose shared buffer mode/auto refresh on Surface" into oc-mr1-dev
2017-07-22 03:01:02 +00:00
Makoto Onuki
584f10e396
Merge "Persist/pacel # of periodic syncs properly." into oc-dr1-dev am: 5bbf44e715 am: 5eb5ec71fa
...
am: 6098a153e2
2017-07-22 01:10:26 +00:00
Makoto Onuki
6098a153e2
Merge "Persist/pacel # of periodic syncs properly." into oc-dr1-dev am: 5bbf44e715
...
am: 5eb5ec71fa
2017-07-22 01:03:39 +00:00
Makoto Onuki
d9a8191ad6
Merge "Persist/pacel # of periodic syncs properly." into oc-dr1-dev
...
am: 5bbf44e715
2017-07-22 00:58:01 +00:00
Makoto Onuki
5eb5ec71fa
Merge "Persist/pacel # of periodic syncs properly." into oc-dr1-dev
...
am: 5bbf44e715
2017-07-22 00:57:59 +00:00
Bookatz
9a17a61683
Merge "Batterystats: fix inappropriate bg timebase reset" into oc-dr1-dev am: 2337b3ba84 am: 63959bae98
...
am: 7cb4094e81
2017-07-22 00:52:53 +00:00
Bookatz
7cb4094e81
Merge "Batterystats: fix inappropriate bg timebase reset" into oc-dr1-dev am: 2337b3ba84
...
am: 63959bae98
2017-07-22 00:47:40 +00:00
TreeHugger Robot
5bbf44e715
Merge "Persist/pacel # of periodic syncs properly." into oc-dr1-dev
2017-07-22 00:45:24 +00:00
Bookatz
63959bae98
Merge "Batterystats: fix inappropriate bg timebase reset" into oc-dr1-dev
...
am: 2337b3ba84
2017-07-22 00:41:57 +00:00
Bookatz
9de5dc9ba8
Merge "Batterystats: fix inappropriate bg timebase reset" into oc-dr1-dev
...
am: 2337b3ba84
2017-07-22 00:41:54 +00:00
TreeHugger Robot
2337b3ba84
Merge "Batterystats: fix inappropriate bg timebase reset" into oc-dr1-dev
2017-07-22 00:35:10 +00:00
David Friedman
5a74b0c8db
Merge "Docs: Updates guidance about using permissions when accessing OBB expansion files, Bug: 34273998 Test: Ran "make" to verify error-free building." into oc-dev am: e4d0557334 am: f20c492190 am: ff160ae465
...
am: bad118a0b4
2017-07-22 00:05:03 +00:00
David Friedman
bad118a0b4
Merge "Docs: Updates guidance about using permissions when accessing OBB expansion files, Bug: 34273998 Test: Ran "make" to verify error-free building." into oc-dev am: e4d0557334 am: f20c492190
...
am: ff160ae465
2017-07-21 23:57:18 +00:00
David Friedman
93a1ab8ba1
Merge "Docs: Updates guidance about using permissions when accessing OBB expansion files, Bug: 34273998 Test: Ran "make" to verify error-free building." into oc-dev am: e4d0557334
...
am: f20c492190
2017-07-21 23:57:01 +00:00
Makoto Onuki
97f82f28da
Don't keep parceled extras for history broadcasts.
...
On dumpsys we do show history broadcast intents with extras, but
if an intent's extras are still parceled, we can't show anything
(but the length) anyway, so let's just remove them, because sometimes
they contain heavy objects such as bitmaps.
Bug: 62144301
Test: manual tests: Boot, add account start apps, insert SIM
Change-Id: Ia64dd46d66fba3098e32c435509f4940ae978710
2017-07-21 16:51:16 -07:00
Andrii Kulian
b6dcc03151
Merge changes from topic 'activity_view_v2-oc-mr1-dev' into oc-mr1-dev
...
am: 504ea09356
2017-07-21 23:23:32 +00:00
Andrii Kulian
9010731abe
DO NOT MERGE ActivityView be gone!
...
am: 94e82d9b0e
2017-07-21 23:22:18 +00:00
Andrii Kulian
504ea09356
Merge changes from topic 'activity_view_v2-oc-mr1-dev' into oc-mr1-dev
...
* changes:
DO NOT MERGE VirtualDisplay wrapper with input forwarding
DO NOT MERGE ActivityView be gone!
2017-07-21 23:16:24 +00:00
David Friedman
ff160ae465
Merge "Docs: Updates guidance about using permissions when accessing OBB expansion files, Bug: 34273998 Test: Ran "make" to verify error-free building." into oc-dev am: e4d0557334
...
am: f20c492190
2017-07-21 23:15:50 +00:00
Romain Guy
0bbf0b41cc
Expose shared buffer mode/auto refresh on Surface
...
These features can be set on a surface to reduce perceived latency
at the expense of visible tearing.
Bug: 63858546
Test: Manual, CTS test coming
Change-Id: Ica3f480bd1cb8f77dff57218d2fa8783433d3396
2017-07-21 16:11:17 -07:00
David Friedman
f20c492190
Merge "Docs: Updates guidance about using permissions when accessing OBB expansion files, Bug: 34273998 Test: Ran "make" to verify error-free building." into oc-dev
...
am: e4d0557334
2017-07-21 23:11:16 +00:00
David Friedman
e4d0557334
Merge "Docs: Updates guidance about using permissions when accessing OBB expansion files, Bug: 34273998 Test: Ran "make" to verify error-free building." into oc-dev
2017-07-21 23:01:56 +00:00
Makoto Onuki
fdc5723076
Persist/pacel # of periodic syncs properly.
...
(Note it shouldn't be persisting parceled data in the first place. There's
already a bug filed for that.)
Bug 63935632
Test: manaul test
Change-Id: I5385caa6cd0663c7e13db0256b2c1027abe6c3a1
2017-07-21 15:30:35 -07:00
Bookatz
993a0be676
Batterystats: fix inappropriate bg timebase reset
...
Previously, the background timebases (of a Uid) were reset when the Uid
resets in the wrong place. This caused StopwatchTimer.reset() to have the timesbase's old value to keep
track of its mUpdateTime. The solution is to call TimeBase.init at the
start of Uid.reset(), instead of calling TimeBase.reset() at the end of
Uid.reset().
Bug: 62352334
Test: runtest -x frameworks/base/core/tests/coretests/src/com/android/internal/os/BatteryStatsTests.java
Change-Id: I23c886544e18f154fc226cc81c22c3ea70fb4c7e
2017-07-21 15:26:13 -07:00
Andrii Kulian
d313469e28
DO NOT MERGE VirtualDisplay wrapper with input forwarding
...
New version of ActivityView that doesn't use expensive
ActivityContainer, but utilizes VirtualDisplays instead.
Creation of this view is only allowed for callers who have
android.Manifest.permission.INJECT_EVENTS permission.
Launching activities into this container is restricted by
the same rules that apply to launching on VirtualDisplays:
- Owner is allowed to launch its own activities.
- If activity that's being launched is not from the same
app, then it must be embeddable and launcher must have
permission to embed.
Bug: 63338670
Test: go/wm-smoke
Change-Id: Id9a25752367ebe8e59d2fc21c5d9de5cf597ea01
2017-07-21 13:14:37 -07:00
Andrii Kulian
94e82d9b0e
DO NOT MERGE ActivityView be gone!
...
This hidden functionality is no longer support/needed since
we now have multi-window/display. A new view group class
will be added later that uses multi-window to support remaining
functionality of this class.
Test: go/wm-smoke
Change-Id: Ie2fa2de92841d33199da9988741905060dd1ddf4
2017-07-21 13:14:19 -07:00
Julia Reynolds
b28a7ed832
Merge "Fix xml loading for managed services" into oc-mr1-dev
...
am: 04964fe069
2017-07-21 20:05:50 +00:00
Julia Reynolds
04964fe069
Merge "Fix xml loading for managed services" into oc-mr1-dev
2017-07-21 19:52:50 +00:00
