Yi Jin
f32af48069
Fix parsing enum types in incident report tool as well as adding
...
some additional loggings
Test: manually flashed to device and test calling IncidentManager.java
functions
Change-Id: I69610414edde865b20ba632837f037fbe43f99db
2017-08-11 17:28:12 -07:00
Cindy Kuang
a585058b54
Merge "Merge "docs: replaced "i.e." to fix formatting error" into oc-dev am: 0580ac8a65 am: 1e6401b07e" into oc-dr1-dev-plus-aosp am: a54ab7edf4
...
am: 3e85fa11ea
2017-08-11 21:43:11 +00:00
Cindy Kuang
3e85fa11ea
Merge "Merge "docs: replaced "i.e." to fix formatting error" into oc-dev am: 0580ac8a65 am: 1e6401b07e" into oc-dr1-dev-plus-aosp
...
am: a54ab7edf4
2017-08-11 21:16:29 +00:00
Cindy Kuang
43adc3d4e3
Merge "docs: replaced "i.e." to fix formatting error" into oc-dev am: 0580ac8a65
...
am: 1e6401b07e
2017-08-11 21:01:11 +00:00
Neil Fuller
0c94e46859
Merge "Change SystemApi as per API council feedback"
2017-08-11 20:50:32 +00:00
Cindy Kuang
1e6401b07e
Merge "docs: replaced "i.e." to fix formatting error" into oc-dev
...
am: 0580ac8a65
2017-08-11 20:45:24 +00:00
Cindy Kuang
0580ac8a65
Merge "docs: replaced "i.e." to fix formatting error" into oc-dev
2017-08-11 20:33:34 +00:00
Yin-Chia Yeh
542edd6dcf
Merge "Camera: fix legacy device CTS failure" into oc-mr1-dev am: 0cfad57566
...
am: df7d855072
2017-08-11 20:03:53 +00:00
Yin-Chia Yeh
df7d855072
Merge "Camera: fix legacy device CTS failure" into oc-mr1-dev
...
am: 0cfad57566
2017-08-11 19:44:50 +00:00
TreeHugger Robot
0cfad57566
Merge "Camera: fix legacy device CTS failure" into oc-mr1-dev
2017-08-11 19:23:11 +00:00
Nate Fischer
f332e96c66
Merge "WebView: remove unused DATA_REDUCTION_PROXY_SETTING_CHANGED API" into oc-mr1-dev am: a9732da1f3
...
am: e1a8030fc9
2017-08-11 18:10:52 +00:00
Nate Fischer
333398f085
Merge "WebView: add WebView#getSafeBrowsingPrivacyPolicyUrl() API" into oc-mr1-dev am: 070e3c0c7f
...
am: 56a9c82325
2017-08-11 18:04:45 +00:00
Nate Fischer
e1a8030fc9
Merge "WebView: remove unused DATA_REDUCTION_PROXY_SETTING_CHANGED API" into oc-mr1-dev
...
am: a9732da1f3
2017-08-11 17:53:47 +00:00
Nate Fischer
56a9c82325
Merge "WebView: add WebView#getSafeBrowsingPrivacyPolicyUrl() API" into oc-mr1-dev
...
am: 070e3c0c7f
2017-08-11 17:49:24 +00:00
TreeHugger Robot
a9732da1f3
Merge "WebView: remove unused DATA_REDUCTION_PROXY_SETTING_CHANGED API" into oc-mr1-dev
2017-08-11 17:38:11 +00:00
Nate Fischer
070e3c0c7f
Merge "WebView: add WebView#getSafeBrowsingPrivacyPolicyUrl() API" into oc-mr1-dev
2017-08-11 17:36:42 +00:00
Neil Fuller
db57c03434
Change SystemApi as per API council feedback
...
API council have requested a manifest constant be added
to the SystemApi directly in preference to an indirect
SystemApi constant here:
android.provider.TimeZoneRulesDataContract.READER_PERMISSION.
This is the third of three changes to (1) add the new constant,
(2) switch over code using the constant, (3) remove the old
constant.
Bug: 64568899
Test: None, build only
Change-Id: I75731b13ce2046556d6148aa5707cab6ed9cf9bf
2017-08-11 14:28:32 +01:00
Sudheer Shanka
b8ad594300
Use cpu freq times to calculate power consumed by an uid.
...
Initially we used to approximate times spent by an uid at a particular
freq using total time spent by the uid but since now the freq times
are directly available from the proc file, we can use these to
calculate power.
Bug: 62240247
Test: bit FrameworksCoreTests:com.android.internal.os.BatteryStatsTests
Test: cts-tradefed run singleCommand cts-dev -m CtsIncidentHostTestCases -t \
com.android.server.cts.BatteryStatsValidationTest
Test: Used some apps and verified that battery usage is attributed to
those apps in Battery settings.
Change-Id: Ia8e2eb07fd778b8a8c83a6acec711e7b97aefdc0
2017-08-11 00:04:50 -07:00
Sudheer Shanka
8518991995
Merge "Update ConnOnActivityStartTest to be hermetic." into oc-mr1-dev am: 06668b5f73
...
am: d732136ed1
2017-08-11 03:22:38 +00:00
TreeHugger Robot
52e94c33bd
Merge "resolve merge conflicts of b90e2c85c0 to master"
2017-08-11 03:04:02 +00:00
TreeHugger Robot
1429b73a5d
Merge "Update GeomagneticField parameters according to WMM-2015"
2017-08-11 02:43:53 +00:00
Nate Fischer
3898ac12e4
WebView: add WebView#getSafeBrowsingPrivacyPolicyUrl() API
...
This adds a dedicated API for fetching a URL for the Safe Browsing
reporting privacy policy.
This URL should be displayed by applications on custom Safe Browsing
interstitials.
Bug: 64077668
Test: make update-api (it compiles and javadocs look good)
Change-Id: I2873260edcaa924e68517c8679079e147b9995f4
2017-08-10 18:33:21 -07:00
Sudheer Shanka
76974ee41e
Merge "DO NOT MERGE: Update BatteryStatsImpl to handle change in no. of freqs." into oc-mr1-dev
...
am: 3cb64c2c51
2017-08-11 01:18:34 +00:00
Phil Weaver
5e64084a6e
resolve merge conflicts of b90e2c85c0 to master
...
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Iea5014345e8a1efd9a30cd8bb18684bdc310ac85
2017-08-10 18:07:33 -07:00
Sudheer Shanka
3cb64c2c51
Merge "DO NOT MERGE: Update BatteryStatsImpl to handle change in no. of freqs." into oc-mr1-dev
2017-08-11 01:05:43 +00:00
Sudheer Shanka
d732136ed1
Merge "Update ConnOnActivityStartTest to be hermetic." into oc-mr1-dev
...
am: 06668b5f73
2017-08-10 23:06:43 +00:00
Phil Weaver
b90e2c85c0
Merge "Stop focusing views before layout." into oc-dr1-dev am: a5dab05b61
...
am: 34f79a67ee
2017-08-10 22:56:35 +00:00
Sudheer Shanka
06668b5f73
Merge "Update ConnOnActivityStartTest to be hermetic." into oc-mr1-dev
2017-08-10 22:52:40 +00:00
Yin-Chia Yeh
daf20731ca
Camera: fix legacy device CTS failure
...
Bug: 64259581
Test: emulator CTS failure is fixed
Change-Id: I9988ffb7877c3f5d62c82ab3c7b8744720824fba
2017-08-10 22:44:50 +00:00
Phil Weaver
2436cb76b9
Merge "Stop focusing views before layout." into oc-dr1-dev
...
am: a5dab05b61
2017-08-10 22:44:47 +00:00
Phil Weaver
34f79a67ee
Merge "Stop focusing views before layout." into oc-dr1-dev
...
am: a5dab05b61
2017-08-10 22:44:39 +00:00
Sudheer Shanka
a87245d305
DO NOT MERGE: Update BatteryStatsImpl to handle change in no. of freqs.
...
Bug: 62240247
Test: cts-tradefed run singleCommand cts-dev -m CtsIncidentHostTestCases -t \
com.android.server.cts.BatteryStatsValidationTest
Change-Id: I1328fe7bf29229e9563cde6eea80addf2b91ea5d
2017-08-10 15:36:47 -07:00
Phil Weaver
a5dab05b61
Merge "Stop focusing views before layout." into oc-dr1-dev
2017-08-10 22:34:03 +00:00
Evan Rosky
c10cc1185b
Merge "Disabled views won't receive focus"
2017-08-10 20:32:03 +00:00
John Reck
d767cec541
Merge "SharedMemory API changes" into oc-mr1-dev am: edf3384307
...
am: 20933d0454
2017-08-10 20:11:47 +00:00
John Reck
20933d0454
Merge "SharedMemory API changes" into oc-mr1-dev
...
am: edf3384307
2017-08-10 19:53:25 +00:00
Evan Rosky
4cdd942650
Merge "Added focus behavior changes to Build.VERSION documentation." into oc-mr1-dev am: 003bd7e3ec
...
am: becff025d7
2017-08-10 19:50:49 +00:00
TreeHugger Robot
edf3384307
Merge "SharedMemory API changes" into oc-mr1-dev
2017-08-10 19:41:53 +00:00
Evan Rosky
becff025d7
Merge "Added focus behavior changes to Build.VERSION documentation." into oc-mr1-dev
...
am: 003bd7e3ec
2017-08-10 19:33:19 +00:00
Phil Weaver
edbcf2c4bf
Stop focusing views before layout.
...
Rolls back one line of ag/2257919.
Bug: 63811145
Test: TalkBack no longer reads the page backwards in:
Settings > System > Reset > Factory data reset
Settings > Connected devices > Android Beam
Change-Id: I6b04e64cd650ebda193da4a54bf0721bd256820c
2017-08-10 12:31:34 -07:00
Evan Rosky
003bd7e3ec
Merge "Added focus behavior changes to Build.VERSION documentation." into oc-mr1-dev
2017-08-10 19:21:29 +00:00
Felipe Leme
3addcb13b8
Merge "CharSequenceTransformation should not change anything when comparision fails." into oc-mr1-dev am: 0edb324403
...
am: 9220ae8a2e
2017-08-10 19:21:09 +00:00
Felipe Leme
9220ae8a2e
Merge "CharSequenceTransformation should not change anything when comparision fails." into oc-mr1-dev
...
am: 0edb324403
2017-08-10 18:57:53 +00:00
TreeHugger Robot
0edb324403
Merge "CharSequenceTransformation should not change anything when comparision fails." into oc-mr1-dev
2017-08-10 18:48:55 +00:00
Cindy Kuang
12d3747c0b
docs: replaced "i.e." to fix formatting error
...
Test: make ds-docs
Bug: 6440865
Change-Id: I428476ddfe55f14df531ea6a1c3e3a09f7a29e7d
2017-08-10 09:59:58 -07:00
Narayan Kamath
c920506d01
Merge "ClassLoaderFactory: Correct broken refactoring from change 19da1cf72e8." into oc-mr1-dev am: 57ae4db225
...
am: 9ed2834cba
2017-08-10 15:52:02 +00:00
Narayan Kamath
9ed2834cba
Merge "ClassLoaderFactory: Correct broken refactoring from change 19da1cf72e8." into oc-mr1-dev
...
am: 57ae4db225
2017-08-10 15:41:36 +00:00
Jeff Sharkey
3994a887f2
Merge "Fix handling of @removed APIs." into oc-mr1-dev am: 5cb2d64b9b
...
am: aff3d6cf6b
2017-08-10 15:37:52 +00:00
Narayan Kamath
57ae4db225
Merge "ClassLoaderFactory: Correct broken refactoring from change 19da1cf72e8." into oc-mr1-dev
2017-08-10 15:34:22 +00:00
Abodunrinwa Toki
d762f32201
Merge "Fix failing Framework TextView tests."
2017-08-10 15:31:54 +00:00
