Commit Graph

5395 Commits

Author SHA1 Message Date
Ryo Hashimoto
9e2177b492 Merge "Use ParcelFileDescriptor's C++ implementation in libbinder"
am: 20e243d627

Change-Id: I0bc6158d1c37ee8a02450dee55ca6732d878fde3
2018-06-11 01:25:46 -07:00
Treehugger Robot
20e243d627 Merge "Use ParcelFileDescriptor's C++ implementation in libbinder" 2018-06-11 07:27:41 +00:00
Jerry Zhang
c2861c5698 Merge "Check for null path in getInternalPathForUser"
am: 0559afdbcc

Change-Id: I0669f429a389655e04f26ab4cd19fbf69f3dbef1
2018-06-08 16:55:43 -07:00
Treehugger Robot
0559afdbcc Merge "Check for null path in getInternalPathForUser" 2018-06-08 20:16:14 +00:00
Jerry Zhang
30f63cf1f9 Check for null path in getInternalPathForUser
In some situations, path could be null resulting
in a crash.

Test: no crash
Bug: 109730998
Change-Id: I2ce0410162d1327905d690331f461f9187e20906
(cherry picked from commit 6f6154bf04)
2018-06-08 11:26:33 -07:00
Neil Fuller
7dbefdcb92 resolve merge conflicts of 26119befba to pi-dev-plus-aosp
BUG: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Iea64af5a88c9bf399fb26468e931be3c73061bac
2018-06-07 20:02:59 +01:00
Neil Fuller
d2f29d7a6f Remove CommonClock / CommonTimeManagementService
The service and associated code is unused.

Bug: 80462439
Test: build / boot
Merged-In: Ibdfab1b7d2951a0c45e07bd47850af037990841b
Change-Id: Ibdfab1b7d2951a0c45e07bd47850af037990841b
2018-06-06 17:03:55 +01:00
Martijn Coenen
e374ec2355 Merge "Serialize calls into BinderProxy." into pi-dev
am: 051b63d4b3

Change-Id: I9d725b05bc4b00eec7c6421e1a3313d6730ad042
2018-06-05 22:44:06 -07:00
Martijn Coenen
dfa390e080 Serialize calls into BinderProxy.
The BinderProxy class is not thread-safe, hence all calls into it
must be serialized. This was achieved by holding the gProxyLock in
JNI code. However, a recent change added calls into BinderProxy
from ActivityManagerService without holding that lock, causing
ConcurrentModificationExceptions.

Instead of dumping debug info from AMS, make the call directly
from JNI, so we can make sure gProxyLock is held correctly.

Also, only dump on debug builds.

Bug: 71353150
Bug: 109701487
Test: sailfish builds, boots, info gets dumped with lowered limits.
Change-Id: I446a71ce4115b9936a01a170401ef98ba3818c0b
2018-06-05 11:18:48 +02:00
Michael Wright
4af6ded846 Merge "Allow for any default vibration intensity level." into pi-dev
am: fb840c9170

Change-Id: Ia1df028a9a0011f47ef2de6ec50e64c227c4b418
2018-05-30 02:38:47 -07:00
Ryo Hashimoto
20529959e8 Use ParcelFileDescriptor's C++ implementation in libbinder
Bug: 80377815
Test: build
Change-Id: I5bfce159fc5c06df29aff9d93ed7d771b7c33d72
2018-05-30 17:57:34 +09:00
Michael Wright
0dbb516a43 Allow for any default vibration intensity level.
Because we can't always create the range of effects we'd like, we may
need different default intensity levels for different devices. This
works fine for prebaked effects, but for application defined amplitudes
we need to provide a scaling function. In addition, this scaling
function should leave amplitude values untouched in the default state so
that application developers produce the effects they expect.

Bug: 80275800
Test: manual
Merged-In: Ibb552ddfa60891853ebcb1a5567ed6745bb5defe
Change-Id: Ibb552ddfa60891853ebcb1a5567ed6745bb5defe
2018-05-30 00:21:38 +01:00
Martijn Coenen
a634f425d9 Merge "Dump proxy debug info when exceeding proxy limit." into pi-dev
am: 879d09f946

Change-Id: I02d14f682c6476b703d160dab911a3afc14af627
2018-05-26 02:19:18 -07:00
Martijn Coenen
eebac6d6b5 Dump proxy debug info when exceeding proxy limit.
If a process gets killed because it sends too many proxies,
dump proxy debug info so we can see what types of interfaces
it sends.

Bug: 71353150
Test: builds, output generated
Change-Id: I3a7787cb3fa73b0b4ad223b18cd79f44e22b9ef5
2018-05-25 20:13:24 +02:00
Andreas Gampe
4f11d5381e Merge "Framework: Add API to get zygote PID" am: 1109e2333f
am: 07578c786a

Change-Id: Ibee53631caad0d6ce2108970598f5226d20a849d
2018-05-24 13:49:41 -07:00
Treehugger Robot
1109e2333f Merge "Framework: Add API to get zygote PID" 2018-05-24 18:28:59 +00:00
Michael Wright
bd02d45b52 Merge "Uncanonicalize URIs before comparing them." into pi-dev
am: 467a831aa6

Change-Id: Ibe0197543af68f937baa4dae768bbc64d34370e4
2018-05-23 13:14:58 -07:00
Jovana Knezevic
f6eed4ba8c Merge "Adding hidden APIs for assigning Admin flag to users." into pi-dev
am: b662f94c37

Change-Id: I4c3d9e5e95cfafbc2f51e9379b516fa402836fe3
2018-05-23 12:21:20 -07:00
Kweku Adams
cb69a53ce5 Merge "Bumping BatteryStats report version." into pi-dev
am: 42b29eb462

Change-Id: I7d512c4b4373019e594dc0422d750b3dddaf3f68
2018-05-23 11:28:50 -07:00
Michael Wright
467a831aa6 Merge "Uncanonicalize URIs before comparing them." into pi-dev 2018-05-23 12:39:34 +00:00
Jovana Knezevic
b662f94c37 Merge "Adding hidden APIs for assigning Admin flag to users." into pi-dev 2018-05-23 05:16:55 +00:00
TreeHugger Robot
42b29eb462 Merge "Bumping BatteryStats report version." into pi-dev 2018-05-23 02:19:20 +00:00
jovanak
f24ad4993c Adding hidden APIs for assigning Admin flag to users.
Also fixing method for requiring both MANAGE_USERS
and INTERACT_ACROSS_USERS_FULL permissions.

Fixes: 80001332
Bug: 25935510
Test: unit test
Change-Id: If10166b4379ddc6a5f004eab77fa1f93abf6ac2a
2018-05-23 00:08:05 +00:00
Kweku Adams
6fe1a5a334 Bumping BatteryStats report version.
Bug: 80147518
Test: Android builds
Change-Id: I663557cdf54dff3184681cf8584b22ad9b9939fe
2018-05-22 15:02:50 -07:00
Jeff Sharkey
fab272e037 Merge "Build browse intents based on target user." into pi-dev
am: c49d44c3ef

Change-Id: I3e7bd4bc41115c42687be3be7c5a03e0919dfaf1
2018-05-22 13:57:30 -07:00
Jeff Sharkey
c49d44c3ef Merge "Build browse intents based on target user." into pi-dev 2018-05-22 20:43:27 +00:00
Michael Wright
f38efd123a Uncanonicalize URIs before comparing them.
In order to ensure we maintain compatibility, we now configure the
canonical URIs instead of the raw URIs. Correspondingly, we need to
uncanonicalize before comparing them.

Note that we uncanonicalize the configured URI, rather than
canonicalizing the one given to us. This is because the canonicalization
format might change (e.g. add extra parameters) at which point they'll
no longer by equal, but should always uncanonicalize to the same value.

Bug: 75947705
Test: manual
Merged-In: If3b02dfef480245210fd2c585c7c727de77a4a73
Change-Id: I53dece42424a6629e0fb406845f57ebbb06dffcb
2018-05-22 18:43:48 +00:00
Jeff Sharkey
b4ee5d7b42 Build browse intents based on target user.
SystemUI runs under a single user (user 0), and needs to build
browse intents for secondary users.  To accommodate this, the safety
check recently added to buildBrowseIntent() needs to be relaxed
when building for a non-current user.

Bug: 79733193
Test: builds, boots
Change-Id: Icce014bf824d0a0ee15e3d84c34f1c2b73d213c1
2018-05-22 12:01:34 -06:00
Svetoslav Ganov
573a696f8f Merge "Make RemoteCallback test API" into pi-dev
am: a757fd7827

Change-Id: Iea481e8a4716bddf48a64d9370d248ffa7871158
2018-05-21 13:04:51 -07:00
Svet Ganov
6b03aa76e9 Make RemoteCallback test API
Test: manual

bug:79782915

Change-Id: I61343573428333c0d4a9ee2523c444753280186c
2018-05-21 15:55:28 +00:00
fionaxu
3eb4b347c8 Merge "add javadoc for carrier ifd install API" into pi-dev
am: c4da4d494b

Change-Id: Iae3d13c662edfe41b3a3c1bfd91c2af1a7e5a980
2018-05-17 16:20:30 -07:00
fionaxu
3083d0b0c7 add javadoc for carrier ifd install API
Bug: 79426800
Change-Id: Iaf5af11220c85dc63164cee31414dce8e4d02037
2018-05-17 15:03:00 -07:00
Pete Gillin
306481a63b Merge "Stop using Arrays.checkOffsetAndCount. am: 60f55a255f" into stage-aosp-master
am: 72629d9999

Change-Id: Ia8f5ce41c654cb6522c6ea5f2863d97f282ce268
2018-05-16 08:27:27 -07:00
Pete Gillin
a9d6a27a2e Stop using Arrays.checkOffsetAndCount.
am: 60f55a255f

Change-Id: Ic9f894d8fe813d0bb6e3776790ff113d2826d881
2018-05-16 07:11:54 -07:00
Pete Gillin
ca3450b524 Merge "Stop using Arrays.checkOffsetAndCount." 2018-05-16 13:04:13 +00:00
Jerry Zhang
9e1d134556 Merge "Access removable volumes through /mnt/media_rw" into pi-dev
am: 1e62b676d9

Change-Id: Ibc2cf0e4243adb0f69f2ba7ac3ca7526bb492b38
2018-05-15 14:50:02 -07:00
Jerry Zhang
1e62b676d9 Merge "Access removable volumes through /mnt/media_rw" into pi-dev 2018-05-15 21:35:43 +00:00
Jerry Zhang
71938e18ca Access removable volumes through /mnt/media_rw
Due to permissions changes, we now need to access
the underlying filesystem of removable devices in
order to get write access.

Add internalPath to StorageVolume, and have VolumeInfo
set the field on creation.

Bug: 77849654
Test: Can write to emulated sdcard through MTP
Change-Id: I63302ecf2dd2600a1c9f3f6ab106c3695654cbaa
2018-05-14 11:39:12 -07:00
Treehugger Robot
87a7c657bd Merge "add install action for carrier id to system API" 2018-05-11 17:36:24 +00:00
fionaxu
4ff8de609b add install action for carrier id to system API
Bug: 79426800
Test: Manual
Change-Id: Icd3e9ae527dc17ab5762aa57df596f058de08d5b
(cherry picked from commit 2776ed56b8)
Merged-in: Icd3e9ae527dc17ab5762aa57df596f058de08d5b
2018-05-11 15:54:45 +00:00
Pete Gillin
60f55a255f Stop using Arrays.checkOffsetAndCount.
Start using ArrayUtils.throwsIfOutOfBounds instead. The Arrays method
is going to be removed.

Bug: 78447530
Test: cts-tradefed run cts-dev -m CtsOsTestCases (shows only unrelated failures: two user/userdebug mismatches and one from b/79471510)
Test: cts-tradefed run cts-dev -m CtsDrmTestCases
Test: adb shell am instrument -w -e class android.content.pm.LimitedLengthInputStreamTest com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner
Test: adb shell am instrument -w -e class android.os.FileBridgeTest com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner

Change-Id: Ib3cd4f4ead61dbec1ccdc94b2ad4ad9c28574582
2018-05-10 18:17:50 +01:00
Andreas Gampe
8444dca38c Framework: Add API to get zygote PID
Add a zygote call that returns the PID of the zygote. Used for
profiling.

Bug: 79266002
Test: m
Change-Id: Idf9ba5ec314eb4cb72921000ad6cb34d1035a92a
2018-05-10 09:10:00 -07:00
fionaxu
907f3cd76b Merge "add install action for carrier id to system API" into pi-dev
am: 689866352b

Change-Id: I472e17218bfe5bcb3178ff6da87910812b17a4dc
2018-05-09 16:08:26 -07:00
TreeHugger Robot
689866352b Merge "add install action for carrier id to system API" into pi-dev 2018-05-09 22:47:40 +00:00
fionaxu
2776ed56b8 add install action for carrier id to system API
Bug: 79426800
Test: Manual
Change-Id: Icd3e9ae527dc17ab5762aa57df596f058de08d5b
2018-05-08 15:25:40 -07:00
android-build-team Robot
ccb89f9263 Merge "Adding batterystats history to proto dump." into pi-dev
am: 291b944d89

Change-Id: Ie1766ac31bc048eeba13d540c446372ef56c2da6
2018-05-08 08:11:22 -07:00
android-build-team Robot
291b944d89 Merge "Adding batterystats history to proto dump." into pi-dev 2018-05-08 14:58:09 +00:00
Mathew Inwood
5449fc727f Treat hidden API exemptions as whitelist.
Update docs accordingly.

Test: m
Bug: 64382372
Merged-In: Ief8daf3badeb046b0461a3ebcd289e242d559070
Change-Id: Ief8daf3badeb046b0461a3ebcd289e242d559070
(cherry picked from commit 33d5138e13)
2018-05-08 10:29:29 +01:00
Kweku Adams
71a9531806 Adding batterystats history to proto dump.
It will only print out a dump for userdebug or eng builds.

Bug: 77727638
Test: flash device and check output of incident proto and
'dumpsys batterystats -c --history'

Merged-In: Ib74d4c664f23a61e6fc33f700ba6a3c6fad32c74
Change-Id: Ia0c993d1281cc350d93f9c13f5540b349a4bfb84
2018-05-07 17:53:57 -07:00
Howard Ro
e68a729b08 Merge "Re-enable the logging of APP_BREADCRUMB_REPORTED atom" into pi-dev
am: 7ca1b03ece

Change-Id: If52d4b0f2b648e118e9cf10705b4eb2068153b75
2018-05-07 14:56:40 -07:00