Commit Graph

5287 Commits

Author SHA1 Message Date
Daniel Colascione
ee9402a767 Merge "Clarify doc comment for android.os.Build.VERSION.RELEASE" am: fe79660d1e am: 7c4bcfc298
am: c266a5d5c0

Change-Id: I865b0fc84cff768352780c245a9ed46cf92f0429
2018-04-06 12:56:13 -07:00
Daniel Colascione
c266a5d5c0 Merge "Clarify doc comment for android.os.Build.VERSION.RELEASE" am: fe79660d1e
am: 7c4bcfc298

Change-Id: I45af296fbec2d35434e0dd0fda4649e6c07e56e3
2018-04-06 12:36:07 -07:00
TreeHugger Robot
88c5c482d3 Merge "Mark methods as @TestApi" 2018-04-06 17:07:56 +00:00
Daniel Colascione
d1520aa11b Clarify doc comment for android.os.Build.VERSION.RELEASE
The RELEASE field has no guaranteed internal structure and developers
should not attempt to parse it.

Test: no code changes
Change-Id: I0ea3ab5ba5dd4cc733feb62725cf7c62c00c857b
2018-04-06 08:36:18 -07:00
Mathew Inwood
a947da9004 Merge "Treat hidden API exemptions as whitelist." into pi-dev am: 35b218d735
am: 4e1da91329

Change-Id: I4f8bf9386d661685464ce19f73c9b241c59f9aea
2018-04-06 07:10:07 -07:00
Mathew Inwood
4e1da91329 Merge "Treat hidden API exemptions as whitelist." into pi-dev
am: 35b218d735

Change-Id: Ia8564c8ff73264da937fe9392d8920d65d637f16
2018-04-06 06:59:51 -07:00
Mathew Inwood
33d5138e13 Treat hidden API exemptions as whitelist.
Update docs accordingly.

Test: m
Bug: 64382372
Change-Id: Ief8daf3badeb046b0461a3ebcd289e242d559070
2018-04-06 12:14:16 +01:00
Narayan Kamath
7e918239b8 resolve merge conflicts of c8f5480981 to pi-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I0aa2671c54b0af4a6104e52aea0b5474922042fe
2018-04-05 15:43:51 +01:00
TreeHugger Robot
c8f5480981 Merge "StrictMode: Add support for warning on non SDK API usage." into pi-dev 2018-04-05 13:41:17 +00:00
Narayan Kamath
53bdcf7d05 Merge "StrictMode: Add support for warning on non SDK API usage." 2018-04-05 10:11:27 +00:00
Fyodor Kupolov
47b2288da3 Merge "Fix reading exception from Parcel" into pi-dev am: e269a5ac62
am: 30f3e957d3

Change-Id: If2d51fee0cb1d84738798c804761233b7004d385
2018-04-04 12:37:42 -07:00
Fyodor Kupolov
30f3e957d3 Merge "Fix reading exception from Parcel" into pi-dev
am: e269a5ac62

Change-Id: I3c4ee53e8f1e96f58034ac89e7f4bb65dd549120
2018-04-04 12:28:29 -07:00
Takamasa Kuramitsu
2214b828e5 Fix reading exception from Parcel
It fails to read exception from Parcel using
Parcel#readException(int, String) because this method doesn't take into
account the remote stack trace info added in writeException().

Test: Manual
Bug: 77495513
Change-Id: I7b646b4a591306832897a42c4ed205d00019cc2b
2018-04-03 11:40:46 -07:00
Alexey Kuzmin
505872d841 Mark methods as @TestApi
Methods previously marked as @hide which are used from cts were marked
as @TestApi
Bug: 74227356
Test: Look through the code of VibrationEffect.

Change-Id: I83cd9b9f19c43467bb310598c6b390583908a162
2018-04-03 15:58:26 +01:00
Narayan Kamath
6e80c19a48 StrictMode: Add support for warning on non SDK API usage.
Adds new API methods to enable and disable these warnings.

(cherry-picked from commit ad1b2a9cc1)

Bug: 73896556
Test: StrictModeTest
Change-Id: I096ce4c355c79cde1b98c3f48d392cd0b2ea5d98
2018-04-03 13:10:13 +01:00
Narayan Kamath
ad1b2a9cc1 StrictMode: Add support for warning on non SDK API usage.
Adds new API methods to enable and disable these warnings.

Bug: 73896556
Test: StrictModeTest

Change-Id: I049812fcdc79f191ab627766f66fc6f51b82e3d1
Merged-In: I096ce4c355c79cde1b98c3f48d392cd0b2ea5d98
2018-04-03 12:40:11 +01:00
Remi NGUYEN VAN
6f5a8db2e9 Merge "Add method to NetworkStatsService for UID stats." into pi-dev 2018-04-02 05:40:04 +00:00
Jeff Sharkey
e827123c68 Merge "Handle public volumes and otherwise invalid UUIDs." into pi-dev am: ee1661f7cd
am: b407389280

Change-Id: I5f11191b063ab17e6d5a3a9edf6cc8cf34272638
2018-03-30 10:55:39 +00:00
Jeff Sharkey
b407389280 Merge "Handle public volumes and otherwise invalid UUIDs." into pi-dev
am: ee1661f7cd

Change-Id: Ibaed0d6289ce9312f2acc2701cea9cee90740492
2018-03-30 10:31:32 +00:00
Remi NGUYEN VAN
b6a920124f Add method to NetworkStatsService for UID stats.
Useful for clients such as BatteryStats which currently rely
on NetworkStatsFactory. Data at that stage is incomplete as
it does not account for tethering, VT data and corresponding
464xlat corrections.

Test: runtest frameworks-net, CTS tests pass.
Bug: b/72107146
Merged-In: I31c5b9b4a7c6e72910152415894a137f000a5858
Merged-In: I2527d95000c7500c824ede70f87ecb38e21ed323
(cherry picked from aosp 088ff6824f)

Change-Id: Ie80f1bb21124241f3414f9be77aceac9a44ec6d1
2018-03-30 18:58:18 +09:00
Jeff Sharkey
b2e66f3257 Merge "Only return internal path when not visible." into pi-dev am: 2254fe2e04
am: 70c93a28e0

Change-Id: I4960cd422e2039fe4451aa750f1b7d8f3ffb04c7
2018-03-30 00:07:41 +00:00
TreeHugger Robot
ee1661f7cd Merge "Handle public volumes and otherwise invalid UUIDs." into pi-dev 2018-03-29 23:33:18 +00:00
Jeff Sharkey
70c93a28e0 Merge "Only return internal path when not visible." into pi-dev
am: 2254fe2e04

Change-Id: I7e90be19432f3ac8e0ec9b878f31416dca6c1e4a
2018-03-29 23:03:26 +00:00
TreeHugger Robot
2254fe2e04 Merge "Only return internal path when not visible." into pi-dev 2018-03-29 22:16:32 +00:00
Jeff Sharkey
18f325012d Handle public volumes and otherwise invalid UUIDs.
Public volumes have short UUIDs (which aren't valid 128-bit UUIDs),
so we can't pass them around.  Even if they were valid UUIDs, we
don't handle clearing cached data on them, and they most likely
don't support fallocate(), so don't match them.

Test: manual
Bug: 74132243
Change-Id: Ib855eb869a86392e96ced94a9926c0b32b87e57e
2018-03-29 14:29:29 -06:00
Jeff Sharkey
18bbed5865 Only return internal path when not visible.
When a volume is visible (wrapped in sdcardfs), we need all file
operations to go through that sdcardfs layer to keep it in sync.

Test: manual
Bug: 73922090
Change-Id: I14f1f4743f470a6cbc78030e1ea8411f9910a5b9
2018-03-29 14:20:50 -06:00
Makoto Onuki
b71ec92c0e Merge "Root (uid=0) should be core. Fix UserHandle.isCore()." into pi-dev am: f3faf62adc
am: aad3482cc4

Change-Id: I8d24943abd41120d5aa73f369fc64b9d89e5fd30
2018-03-29 18:11:44 +00:00
Makoto Onuki
aad3482cc4 Merge "Root (uid=0) should be core. Fix UserHandle.isCore()." into pi-dev
am: f3faf62adc

Change-Id: Ie4af59f3892be89adfcdbe9a0cb02e92aab2c8b2
2018-03-29 17:53:30 +00:00
Chenjie Yu
255aacf801 Merge "Fix StatsCompanionService pull on bucket ends" into pi-dev am: 925a04b775
am: 985270a6a0

Change-Id: I12709668687d1646a1db949b612114af78311592
2018-03-29 17:52:34 +00:00
Chenjie Yu
985270a6a0 Merge "Fix StatsCompanionService pull on bucket ends" into pi-dev
am: 925a04b775

Change-Id: I1aac27b4a83158b336e0fcff16a18a06ab310615
2018-03-29 17:33:18 +00:00
TreeHugger Robot
f3faf62adc Merge "Root (uid=0) should be core. Fix UserHandle.isCore()." into pi-dev 2018-03-29 17:17:23 +00:00
TreeHugger Robot
925a04b775 Merge "Fix StatsCompanionService pull on bucket ends" into pi-dev 2018-03-29 17:00:25 +00:00
Bookatz
ebf962f74b Dummy WorkChain class
To avoid future merge conflicts, a dummy WorkChain class must be
added temporarily. It goes along with the dummy StatsLog.java class.

Bug: 71607284
Test: none
Merged-In: Iff361eb98e079c7b2146c092dc27a3618a813c94
Change-Id: I66cf0c36c1842b99a5a4dd104fc5c06c0cfbe2b5
2018-03-29 09:43:05 -07:00
Chenjie Yu
1a0a941c20 Fix StatsCompanionService pull on bucket ends
+ change StatsPullerManager internal time units to be consistent
+ use series of alarms for pullers, instead of use setRepeating

Bug: 76223345
Bug: 75970648
Test: cts test
Change-Id: I9e6ac0ce06541f5ceabd2a8fa444e13d40e36983
2018-03-29 00:11:13 -07:00
Chet Haase
92b7bc5fbe Merge "Add targetSdk check around new LinearLayout weighted measure behavior" 2018-03-29 01:24:17 +00:00
Makoto Onuki
cbc3ccec61 Root (uid=0) should be core. Fix UserHandle.isCore().
Bug: 77240427
Change-Id: I057e8f50370fb1cd74ff2ebdab41990a682cec6f
Fix: 77240427
Test: build & boot
Test: "am set-standby-bucket com.google.android.apps.docs 40" will override ACTIVE
2018-03-28 16:49:47 -07:00
David Pursell
57f25ad657 Merge "Merge "MessageQueue: explicitly remove FD event listeners." am: b43daf5f7b am: 040587641b" into pi-dev-plus-aosp
am: 1058f42271

Change-Id: I5093ca0d576473f490347ab4244af11a2835d23a
2018-03-28 22:16:24 +00:00
David Pursell
bea874b7fa Merge "MessageQueue: explicitly remove FD event listeners." am: b43daf5f7b
am: 040587641b

Change-Id: Ia4537ab0db75eabe8b3bf3fc07585a36769727f8
2018-03-28 20:59:26 +00:00
Pavel Grafov
c397f7bdfc Merge "Improve javadoc for DISALLOW_DEBUGGING_FEATURES." 2018-03-28 19:40:31 +00:00
Treehugger Robot
b43daf5f7b Merge "MessageQueue: explicitly remove FD event listeners." 2018-03-28 18:06:31 +00:00
Mathew Inwood
8faeab8735 Configurable hidden API exemptions.
Extend the existing hidden_api_blacklist_exemptions config to support a
list of API signature prefixes to exclude from hidden API enforcement.

Push this list down to the zygote process when that process is created,
and when the list changes. This minimizes overhead, but should also ensure
that all new processes get the latest whitelist.

Test: $ adb shell settings put global hidden_api_blacklist_exemptions \
Test:    Landroid/view/RemoteAnimationDefinition\\\;:Landroid/app/ActivityManager\\\$TaskDescription\\\;
Test: Manually verify logcat output from app which uses named APIs
Bug: 73337509

(cherry picked from commit 2c6f97d4c9)

Merged-In: Ib1245b69da4dac50c6968f1be62f1a74591dc433
Change-Id: I7b590f272fdcfcda5f18e216788ac34bc58beaed
2018-03-28 11:54:17 +01:00
Narayan Kamath
028ee699dc Merge "Build: Remove MIN_SUPPORTED_TARGET_SDK_INT from public API." into pi-dev am: 77e0b7b821
am: 6a2e8e0106

Change-Id: I4d6211a1baabce7d24fac7e05ec6bf66f166d6c3
2018-03-28 09:13:07 +00:00
Narayan Kamath
6a2e8e0106 Merge "Build: Remove MIN_SUPPORTED_TARGET_SDK_INT from public API." into pi-dev
am: 77e0b7b821

Change-Id: I8380a14b0862a8ec36b880c4e851120aa62d58e0
2018-03-28 09:02:51 +00:00
Narayan Kamath
77e0b7b821 Merge "Build: Remove MIN_SUPPORTED_TARGET_SDK_INT from public API." into pi-dev 2018-03-28 08:43:08 +00:00
Dianne Hackborn
40eca65f1a Merge "Work on issue #74404949: Screen state usage API" into pi-dev am: 00f3c4333e
am: 30181d3bc1

Change-Id: I4a3ee230b1ce30022f85e271d0f0708f73af4026
2018-03-28 01:04:17 +00:00
Dianne Hackborn
30181d3bc1 Merge "Work on issue #74404949: Screen state usage API" into pi-dev
am: 00f3c4333e

Change-Id: I3bff628d13f1089213edf84aa1feffd683b99cd7
2018-03-27 23:37:02 +00:00
Mathew Inwood
9075eac89f Merge "Merge "Configurable hidden API exemptions." am: 4b8285b907 am: 625aa8d33a" into pi-dev-plus-aosp
am: d1cbe1af4f

Change-Id: I2d2a2fc37ff32523f5bd0c92b1d8273b9b8e7c91
2018-03-27 23:28:03 +00:00
Mike Ma
6a48d99363 Merge "Track USB data link in batterystats" into pi-dev am: 3787f73198
am: 6a929dd0cf

Change-Id: I10472eeacc805aa09b4de8588a6779796f3c0926
2018-03-27 22:57:30 +00:00
Jeff Sharkey
ea5682f52d Merge changes Iba4e52c2,I81160755 into pi-dev am: 5681efd1af
am: bbe24ee1bb

Change-Id: I6d7262aedfea7e1635db43a82e8200210a97639e
2018-03-27 22:50:33 +00:00
Dianne Hackborn
00f3c4333e Merge "Work on issue #74404949: Screen state usage API" into pi-dev 2018-03-27 22:40:51 +00:00