Yi Jin
8529150860
Only replace new line characters if the wakelock name contains one
...
The original operation creates new string everytime which is expensive
Bug: 64272195
Test: NA
Change-Id: Id93d588a7d5a6b6c192a057fcd4296bd1c508516
2017-08-04 13:27:20 -07:00
Yi Jin
be738c5a28
Merge "There must not have newline character in wakelock name"
2017-08-03 22:53:10 +00:00
Yi Jin
dd214c2d36
There must not have newline character in wakelock name
...
Bug: 64272195
Test: N/A
Change-Id: I07a7d9b9dfbf69acba0123bf4ec6e309c2a5a359
2017-08-03 11:29:49 -07:00
John Reck
ccf8aa5e61
Merge "Address API review comments" into oc-mr1-dev am: dd5afab0d4
...
am: 639afe25f3
2017-08-03 02:28:44 +00:00
John Reck
639afe25f3
Merge "Address API review comments" into oc-mr1-dev
...
am: dd5afab0d4
2017-08-03 02:18:54 +00:00
TreeHugger Robot
dd5afab0d4
Merge "Address API review comments" into oc-mr1-dev
2017-08-03 02:10:16 +00:00
Dianne Hackborn
84e328c9f8
Merge "Improve docs about exceptions through Binder." into oc-mr1-dev am: 6e3af279ab
...
am: 5a0d703564
2017-08-02 18:14:26 +00:00
Dianne Hackborn
5a0d703564
Merge "Improve docs about exceptions through Binder." into oc-mr1-dev
...
am: 6e3af279ab
2017-08-02 17:59:17 +00:00
Sundong Ahn
bae17bc4e5
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
...
am: 577653628b
2017-08-02 17:43:02 +00:00
Sundong Ahn
014ca608c7
Merge "Merge "Add hwbinder library" am: 49e2a9a612 am: 811027ede7 am: 2785be7572" into oc-dr1-dev-plus-aosp
...
am: a4fb234a4c
2017-08-02 17:27:38 +00:00
John Reck
f995f9a87a
Address API review comments
...
Also make it less error-prone to use unmap() incorrectly.
Bug: 64264008
Test: CTS tests pass
Change-Id: I21559676e7a850b76db4b61a31e43833396c6087
2017-08-02 10:24:18 -07:00
Sundong Ahn
30538850f2
Merge "Add hwbinder library" am: 49e2a9a612 am: 811027ede7
...
am: 2785be7572
2017-08-02 17:14:55 +00:00
Sundong Ahn
2785be7572
Merge "Add hwbinder library" am: 49e2a9a612
...
am: 811027ede7
2017-08-02 17:05:56 +00:00
Sundong Ahn
811027ede7
Merge "Add hwbinder library"
...
am: 49e2a9a612
2017-08-02 16:57:50 +00:00
Dianne Hackborn
18482aef9e
Improve docs about exceptions through Binder.
...
Test: built
Change-Id: I5b6af61daa373c92f7d7b3b341a20fbd9e691da9
2017-08-01 17:46:23 -07:00
Dianne Hackborn
fe05f9e390
Merge "Fix issue #64224738 : Document return value of IBinder.transact()" into oc-mr1-dev am: 47e6cc34bb
...
am: e4a04e87d1
2017-08-01 20:58:43 +00:00
Dianne Hackborn
47e6cc34bb
Merge "Fix issue #64224738 : Document return value of IBinder.transact()" into oc-mr1-dev
2017-08-01 20:01:32 +00:00
Makoto Onuki
443d9cacfe
Merge "Revert "Reduce duplicate strings due to the package cache."" into oc-mr1-dev am: f6764fb7f7
...
am: a843ab3727
2017-08-01 16:37:17 +00:00
Makoto Onuki
f6764fb7f7
Merge "Revert "Reduce duplicate strings due to the package cache."" into oc-mr1-dev
2017-08-01 16:11:27 +00:00
Dianne Hackborn
0785389f81
Merge "Add documentation on oneway transaction ordering." into oc-mr1-dev am: 0b8f281637
...
am: dae5beb369
2017-08-01 02:49:33 +00:00
Sundong Ahn
28cc6e88fd
Add hwbinder library
...
HAL impls will depend hwbinder.jar instead of framework.jar on
build-time, but on runtime framework.jar will be used.
This is to cut the circular dependency when using configstore from
Android framework. Also added JNI call to HwBinder.java to cut
configstore's dependency on systemproperty in framework.jar.
Note that hwbinder.jar is LOCAL_UNINSTALLABLE_MODULE and so it won't be
installed in an actual image.
Bug: 35771640
Test: build & run
Change-Id: I2420298cf9df5d6bbcead3e4451b703ce9bc3e29
2017-08-01 11:26:18 +09:00
TreeHugger Robot
0b8f281637
Merge "Add documentation on oneway transaction ordering." into oc-mr1-dev
2017-08-01 02:21:21 +00:00
Makoto Onuki
63e624a61e
Revert "Reduce duplicate strings due to the package cache."
...
The pool is just broken.... I need to fix it and re-evaluate.
This reverts commit e86a29c6e6
2017-08-01 00:42:33 +00:00
Dianne Hackborn
4cd650c008
Fix issue #64224738 : Document return value of IBinder.transact()
...
Also add appropriate @NonNull and @Nullable annotations.
Test: built
Change-Id: I22de48105ef685baf594cfc004dd3e27e2ba09e9
2017-07-31 17:39:17 -07:00
Dianne Hackborn
6f12f2233e
Add documentation on oneway transaction ordering.
...
Test: built
Change-Id: I4d2e336327a4ce9c8f76d49037c894e981bdf571
2017-07-31 17:02:51 -07:00
Makoto Onuki
6afc3001b9
Merge "Reduce duplicate strings due to the package cache." into oc-mr1-dev am: bb77e6c689
...
am: bc939bbe7c
2017-07-31 18:12:08 +00:00
TreeHugger Robot
bb77e6c689
Merge "Reduce duplicate strings due to the package cache." into oc-mr1-dev
2017-07-31 17:52:41 +00:00
Jeff Sharkey
e2c0f95a43
Merge "Migrate plans to @SystemApi, evolve permissions." into oc-mr1-dev am: 2c131cafae
...
am: 284eab179c
2017-07-30 00:27:17 +00:00
Jeff Sharkey
b7479988d2
Migrate plans to @SystemApi, evolve permissions.
...
We're not yet ready to commit to SubscriptionPlan as public API, so
relax to be @SystemApi instead. Add a new MANAGE_SUBSCRIPTION_PLANS
permission that we require apps to hold, unless they've been
delegated access via a trusted CarrierService.
Since several apps have the ability to provide plans for a single
subId, we now remember the "owner" who set the current plan
information, and we refuse to leak plan information beyond the app
that originally set it.
Relax permissions check to not require READ_PHONE_STATE, since we're
only returning data that an app provided to us earlier. Also fix
NPE when SubscriptionInfo is missing.
Test: bit FrameworksServicesTests:com.android.server.NetworkPolicyManagerServiceTest
Bug: 63997177, 63928277, 64156138, 63903381
Change-Id: If503378ef406dcaec438c9b41e837e0a821a3ef4
2017-07-28 16:59:14 -06:00
Makoto Onuki
e86a29c6e6
Reduce duplicate strings due to the package cache.
...
The following charts are the actual measurement with and without the fix,
using "dumpsys system".
- The red bar is "total private dirty".
- The X axsis is time since boot.
Without fix:
- First boot:
https://docs.google.com/spreadsheets/d/1R6lL0AnAp93HnrqWujJFNgOjj6wvGicgDlbDAevbc3g/edit#gid=0
Private dirty stabilizes at ~16.8M.
- Second boot:
https://docs.google.com/spreadsheets/d/1R6lL0AnAp93HnrqWujJFNgOjj6wvGicgDlbDAevbc3g/edit#gid=1918404197
Private dirty stabilizes at ~17.8M.
With fix:
- First boot:
https://docs.google.com/spreadsheets/d/1R6lL0AnAp93HnrqWujJFNgOjj6wvGicgDlbDAevbc3g/edit#gid=791764875
Private dirty stabilizes at ~17.0M.
- Second boot:
https://docs.google.com/spreadsheets/d/1R6lL0AnAp93HnrqWujJFNgOjj6wvGicgDlbDAevbc3g/edit#gid=1820894299
Private dirty stabilizes at ~17.0M.
Test: build, boot, reboot, adb-install, reboot
bit FrameworksCoreTests:android.content.pm.PackageParserTest
Bug: 64112468
Change-Id: I5ae9c1b2d021fe62526d4e0dd1a52a962b48206e
2017-07-28 15:09:13 -07:00
Benjamin Miller
ae4b64ab41
Merge "Docs: Note that DISALLOW_CONFIG_VPN stops VPNs from starting" into oc-dev am: 91f16ace4f
...
am: 5934ae605a
2017-07-28 21:15:41 +00:00
Benjamin Miller
2c2d19504c
Merge "Docs: Note that DISALLOW_CONFIG_VPN stops VPNs from starting" into oc-dev am: 91f16ace4f
...
am: c058675b80
2017-07-28 17:39:42 +00:00
Benjamin Miller
5934ae605a
Merge "Docs: Note that DISALLOW_CONFIG_VPN stops VPNs from starting" into oc-dev
...
am: 91f16ace4f
2017-07-28 17:30:18 +00:00
Benjamin Miller
c058675b80
Merge "Docs: Note that DISALLOW_CONFIG_VPN stops VPNs from starting" into oc-dev
...
am: 91f16ace4f
2017-07-28 17:30:16 +00:00
Benjamin Miller
05fef7ed69
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
(cherry picked from commit 1f83e4d498
2017-07-28 09:56:24 +00:00
Todd Poynor
dd05582eab
thermalservice: Add ThermalService java interfaces
...
Binder service ThermalService broadcasts thermal events to registered
listeners.
Test: manual: marlin with modified thermal-engine.conf and temporary
java thermal event listener
Bug: 30982366
Change-Id: I11f7fd18feff3b9af0eecc3fd3a13d54c0b97ff0
2017-07-28 02:22:42 +00:00
Sudheer Shanka
a5e36b158f
Merge "Track per-cluster times of each uid in microsec."
2017-07-25 20:51:24 +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
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
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
Sudheer Shanka
af85741e48
Track per-cluster times of each uid in microsec.
...
Bug: 62805443
Test: Used some apps and verified that battery usage is attributed to
these apps in Settings>Battery.
Change-Id: I0e604fdc0d1704d7d061b6a711a0017b82a39b8f
2017-07-21 18:29:16 -07: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
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
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
Benjamin Miller
ca4f0f98a2
Merge "Docs-change: how UserManager.ENSURE_VERIFY_APPS affects profiles." into oc-dev am: baa85250d4
...
am: aeb503f7ca
2017-07-20 14:09:07 +00:00
Benjamin Miller
97c8fea260
Merge "Docs-change: how UserManager.ENSURE_VERIFY_APPS affects profiles." into oc-dev am: baa85250d4
...
am: aeb503f7ca
2017-07-20 14:09:05 +00:00
Benjamin Miller
9051bbf2cb
Merge "Docs-change: how UserManager.ENSURE_VERIFY_APPS affects profiles." into oc-dev
...
am: baa85250d4
2017-07-20 14:05:31 +00:00
Benjamin Miller
aeb503f7ca
Merge "Docs-change: how UserManager.ENSURE_VERIFY_APPS affects profiles." into oc-dev
...
am: baa85250d4
2017-07-20 14:05:31 +00:00
