296690 Commits

Author SHA1 Message Date
Fyodor Kupolov
d4f9d37424 Merge "Presubmit test for PackageManager" 2016-11-21 23:58:01 +00:00
Ashutosh Joshi
3fc75d4bf6 Merge "Cleanup ContexthubService implementation" 2016-11-21 23:39:54 +00:00
Etan Cohen
43518242a3 Merge "[AWARE] Update API per review" am: 9e4f111e0f am: ce7f932be7 am: 86cd994a15
am: 355e52215f

Change-Id: I0f334e1db798bdfcadb4547d7edda5200e160b43
2016-11-21 23:07:34 +00:00
Jeff Sharkey
f640cd318d Merge "StrictMode to detect untagged network traffic." am: 67fe28d925 am: db5ed5beb1 am: 3391f3376e
am: 55727aaede

Change-Id: I272964fc9c2a9e350bacc0586dd6b2d4a23c5f51
2016-11-21 23:05:12 +00:00
Jeff Sharkey
4df8fdb5c6 Merge "Stub Binder API." am: 4db1632b3a am: 313456c975 am: c61a8e01a3
am: 8984897502  -s ours

Change-Id: Ib052b3afcf046786732d8084188d7fbec9805215
2016-11-21 23:03:55 +00:00
TreeHugger Robot
e83e197931 Merge "Added 'oneway' flags on AIDL where appliable." 2016-11-21 23:00:44 +00:00
Android Build Merger (Role)
99820db99a Merge "Merge "Fix createConfirmDeviceCredentialIntent for wear for CTS." into cw-f-dev am: f9154e923b am: de098d013c am: f8ab89c514" 2016-11-21 22:56:53 +00:00
Adam Lesinski
7f79e1e476 Merge "Move Resource creation out of ContextImpl constructor" 2016-11-21 22:56:18 +00:00
Nancy Zheng
9432235fe4 Merge "Fix createConfirmDeviceCredentialIntent for wear for CTS." into cw-f-dev am: f9154e923b am: de098d013c
am: f8ab89c514

Change-Id: I7fa6629d5264ed7c96cced3355f900b9b2b99919
2016-11-21 22:55:55 +00:00
TreeHugger Robot
d2e6ca5266 Merge "Merge commit '2a12d8520ea6f41bd2db8577a8da82204e341c51' into manual_merge_2a12d85" 2016-11-21 22:53:04 +00:00
Etan Cohen
355e52215f Merge "[AWARE] Update API per review" am: 9e4f111e0f am: ce7f932be7
am: 86cd994a15

Change-Id: Iecf2458a037431114a8b9e0063524d2093fa13fc
2016-11-21 22:12:00 +00:00
Etan Cohen
86cd994a15 Merge "[AWARE] Update API per review" am: 9e4f111e0f
am: ce7f932be7

Change-Id: I4702d65237c4a56b1f2cad2bf5e3505f1cd4ecfc
2016-11-21 21:58:55 +00:00
Jeff Sharkey
55727aaede Merge "StrictMode to detect untagged network traffic." am: 67fe28d925 am: db5ed5beb1
am: 3391f3376e

Change-Id: I942f9c44a8c3b1abf39694816a34790df3e224ad
2016-11-21 21:58:02 +00:00
Etan Cohen
ce7f932be7 Merge "[AWARE] Update API per review"
am: 9e4f111e0f

Change-Id: I69001477d02c612540ff74385400551293f7c600
2016-11-21 21:50:34 +00:00
Jeff Sharkey
3391f3376e Merge "StrictMode to detect untagged network traffic." am: 67fe28d925
am: db5ed5beb1

Change-Id: Id6ce5cfedab250f25c0eb8b0c49971e9e20cbeb2
2016-11-21 21:48:31 +00:00
Jeff Sharkey
db5ed5beb1 Merge "StrictMode to detect untagged network traffic."
am: 67fe28d925

Change-Id: I52cdce87d87ec503294e431c8f22e87235bdbf79
2016-11-21 21:43:58 +00:00
Etan Cohen
9e4f111e0f Merge "[AWARE] Update API per review" 2016-11-21 21:43:40 +00:00
Steven Moreland
e4e166790b Merge "LightService: log errors." 2016-11-21 21:39:41 +00:00
Treehugger Robot
67fe28d925 Merge "StrictMode to detect untagged network traffic." 2016-11-21 21:33:15 +00:00
Felipe Leme
254c2c99dd Added 'oneway' flags on AIDL where appliable.
Not only if fixes warning about outgoing transactions from system_server
not having the FLAG, but it fixes system crashes when the service
doesn't behave well (for example, if it does not call super.onCreate()
on onCreate().

BUG: 31001899
Test: manually built and ran it

Change-Id: I829ee501edb84bd02a60e8df92f9a0e0d2157887
2016-11-21 13:21:43 -08:00
Nancy Zheng
40cd8e410d Merge commit '2a12d8520ea6f41bd2db8577a8da82204e341c51' into manual_merge_2a12d85
Test: compiled everything, CTS verifier passes
Change-Id: I96641860890e413342bcb6a3b24e87d6aeff0c99
2016-11-21 12:58:16 -08:00
Jeff Sharkey
8984897502 Merge "Stub Binder API." am: 4db1632b3a am: 313456c975
am: c61a8e01a3

Change-Id: Id40456a710ce24f1af98b8e70a894a1fbe8d0690
2016-11-21 20:31:28 +00:00
TreeHugger Robot
78d6e340e1 Merge "No direct Uri grants from system." 2016-11-21 20:29:04 +00:00
Ashutosh Joshi
85547d15e0 Cleanup ContexthubService implementation
. Reorder include headers.
. Remove scary - but errorneous log.

Test: Presubmit passes.
Change-Id: I06c7b34bbf9ae59940c44eccc8545ea1c23faa15
2016-11-21 12:27:59 -08:00
Jeff Sharkey
c61a8e01a3 Merge "Stub Binder API." am: 4db1632b3a
am: 313456c975

Change-Id: Icc2db98a8ab325ca4bc7456abe5963c293a878cb
2016-11-21 20:26:22 +00:00
Jeff Sharkey
313456c975 Merge "Stub Binder API."
am: 4db1632b3a

Change-Id: I00e7f39d525a1d6af9a07b192294060113a2f7c2
2016-11-21 20:21:25 +00:00
Jeff Sharkey
4db1632b3a Merge "Stub Binder API." 2016-11-21 20:10:29 +00:00
Philip P. Moltmann
76932df9ec Merge "Wait when other thread is binding to print spooler" 2016-11-21 19:21:24 +00:00
Jeff Sharkey
763a140796 StrictMode to detect untagged network traffic.
Define some constants for early use in AOSP code.

Test: builds, boots, all common traffic tagged
Bug: 30943431
Change-Id: Ia58a8933bccfddbc027afb78c63ae65bd71ce562
2016-11-21 12:15:16 -07:00
Jeff Sharkey
2dfe92c2df No direct Uri grants from system.
The system should never be extending Uri permission grants from
itself, since it automatically holds all the permissions.  Instead,
the system should always be a mediator between two specific app, and
it should be using startActivityAsCaller() if it needs to extend
permissions.

Blocking at this level fixes an entire class of confused deputy
security issues.

Test: builds, normal intent resolution UI works
Bug: 33019296
Change-Id: Iaa57c393a386d8068e807d0dd0caccc89d8a11db
2016-11-21 12:03:22 -07:00
Nancy Zheng
f8ab89c514 Merge "Fix createConfirmDeviceCredentialIntent for wear for CTS." into cw-f-dev am: f9154e923b
am: de098d013c

Change-Id: Ia77e561eb2aabba4a29b81c09b55d251a3e6ece5
2016-11-21 18:26:24 +00:00
Nancy Zheng
2a12d8520e Fix createConfirmDeviceCredentialIntent for wear for CTS. am: 43f166dfb4
am: a2193c0b76

Change-Id: I9f216231ff600972e3ddec195158fc2489693a1e
2016-11-21 18:25:12 +00:00
Etan Cohen
6831f93725 [AWARE] Update API per review
- Move Handler to last position
- Peer ID changed from 'Object' -> opaque class
- Rename onMessageSent -> onMessageSendSucceeded

(cherry pick of commit 1fef08507aeb49bb2e4e7be4804a378ba2cf7770)

Bug: 31470256
Test: unit tests & integration (sl4a) tests pass
Change-Id: I5530d310e982ea16a63a5af1f704625fd24e436c
2016-11-21 18:23:39 +00:00
Nancy Zheng
de098d013c Merge "Fix createConfirmDeviceCredentialIntent for wear for CTS." into cw-f-dev
am: f9154e923b

Change-Id: I554442be467ad618d02e5f8f3199d57c45d7b972
2016-11-21 18:19:53 +00:00
Nancy Zheng
a2193c0b76 Fix createConfirmDeviceCredentialIntent for wear for CTS.
am: 43f166dfb4

Change-Id: Icda6d5182ff20c4db150ae3f0351e559682184de
2016-11-21 18:19:48 +00:00
Nancy Zheng
f9154e923b Merge "Fix createConfirmDeviceCredentialIntent for wear for CTS." into cw-f-dev 2016-11-21 18:13:06 +00:00
Jeff Sharkey
1324531355 Stub Binder API.
Provide a stub API for AOSP code to call.

Test: builds
Bug: 32715088
Change-Id: Iab74d269e795a722e82fd3fa304200d57d152f57
2016-11-21 18:11:25 +00:00
Jeff Tinker
66f6547ba9 Merge "Removing widevine classic" 2016-11-21 17:53:18 +00:00
Torne (Richard Coles)
2c0dc3e094 Merge "Precreate the classloader for the WebView." am: 566b1c80e4 am: 1feb782f01 am: 9565860b08
am: 7e17c6b0f1

Change-Id: Ie512327827e48319b3244a8d3041cb78538109d3
2016-11-21 17:18:55 +00:00
Torne (Richard Coles)
7e17c6b0f1 Merge "Precreate the classloader for the WebView." am: 566b1c80e4 am: 1feb782f01
am: 9565860b08

Change-Id: I070288a127cbaa08f05b49f66e23ea0ec298040b
2016-11-21 17:13:45 +00:00
Torne (Richard Coles)
9565860b08 Merge "Precreate the classloader for the WebView." am: 566b1c80e4
am: 1feb782f01

Change-Id: Iec0bf848e4c25afc6a6b9ee83339a03f314adee9
2016-11-21 17:08:46 +00:00
Torne (Richard Coles)
1feb782f01 Merge "Precreate the classloader for the WebView."
am: 566b1c80e4

Change-Id: Ic79079748dae515cb8d89ef99148755ac65f1d47
2016-11-21 17:04:22 +00:00
Treehugger Robot
566b1c80e4 Merge "Precreate the classloader for the WebView." 2016-11-21 16:54:53 +00:00
Jeff Sharkey
ca50c360bf Merge "Check provider access for content changes." 2016-11-21 16:19:43 +00:00
Ian Pedowitz
cd3672586e Merge "Revert "Lists returned from OS aren't mutable."" 2016-11-21 15:13:30 +00:00
Ian Pedowitz
4fe2517732 Revert "Lists returned from OS aren't mutable."
This reverts commit 97449fa389dbc1ab872d63fde001bae7a659991b.

Bug: 33034458
Bug: 33032977
Bug: 27856974
Change-Id: If913e587ce4a48b9ed1c7c0a811bc39ce4e31d3c
2016-11-21 15:09:54 +00:00
Torne (Richard Coles)
3b6ca99b10 Precreate the classloader for the WebView.
We want to create the classloader for the WebView in advance in the
zygote so that it can preload Java and native code for its children, but
the zygote can't talk to the package manager (so doesn't have a
PackageInfo for the APK) and also doesn't have an ActivityThread, so
constructing a LoadedApk is difficult.

Instead, we use the fact that ApplicationLoaders contains a
process-global cache of classloaders for APKs, and prepopulate a cache
entry without constructing a LoadedApk. This requires making
ApplicationLoaders public. To calculate the correct library paths from
the information the zygote has, we reuse the logic in LoadedApk (which
is already public, and just needs a small change to allow a null
ActivityThread when checking for instrumentation).

The other parameters for classloader creation (target SDK, bundled app,
etc) are hardcoded to usable values for the WebView's case. WebView
never needs to use any system libraries that aren't public so claiming
it's not bundled is fine even when that isn't actually true, and WebView
will always target the current platform API level.

Once the classloader is created, look up the factory class and call
preloadInZygote on it to give it a chance to preload the native library
and do other shared initialisation.

Bug: 21643067
Test: enable multiprocess WebView, examine librank output to see sharing
Change-Id: I696ead637e3f7382bcc58cfaf61eac5921862015
2016-11-21 15:04:13 +00:00
Tobias Thierer
03c28084d5 Merge "API: Rename Collections.singleton*() type arg E -> T" 2016-11-21 14:33:53 +00:00
Tobias Thierer
be7e5900b2 API: Rename Collections.singleton*() type arg E -> T
This rename is part of the update of Collections.java to OpenJDK8u60.

This is compatible change because generic type argument names affect
neither compile time nor runtime compatibility.

The build system (incorrectly) flags this as a change to a released
API. Removing or changing released public APIs is infeasible on AOSP.
Therefore this change will remain restricted to internal branches
until the API is released.

Bug: 31902309
Test: make
Change-Id: I54bc3d6321429ff18c6057332b469286e8b1d42d
2016-11-21 11:45:27 +00:00
TreeHugger Robot
6b18e8f58c Merge "Import translations. DO NOT MERGE" 2016-11-21 07:26:08 +00:00