Commit Graph

277484 Commits

Author SHA1 Message Date
Etan Cohen
f74733a367 Merge "[AWARE] Move manager tests from service to manager directory"
am: 018f6ec16f

Change-Id: I795e75882ac702c3637afa43ba2f73d612d74661
2016-11-23 23:50:27 +00:00
Etan Cohen
018f6ec16f Merge "[AWARE] Move manager tests from service to manager directory" 2016-11-23 23:42:30 +00:00
Hall Liu
b222d2045d Add removeState method to StateMachine
Method to be used by BluetoothRouteManager in Telecom.

Test: unit tests in Telecom
Change-Id: Icdd1a3d42224246a5f26100fabb26313ce83b14c
2016-11-23 11:52:58 -08:00
Etan Cohen
b77b69545e [AWARE] Move manager tests from service to manager directory
Move operation - no functional tests. Only editorial changes:
- Remove (no longer) necessary import statements
- Removed reference to a constant sitting on the service side.
  Replaced with locally defined constant.

(cherry pick of commit 7ba5ad3c53dac62e56cd12dbe2054ce8374b6b92)

Bug: 32954930
Test: unit-tests pass
Change-Id: Ibe463fa73c27fc67996460eb91ea0222437927a6
2016-11-23 10:28:09 -08:00
Sergey Yakovlev
989c44be2c Update Samsung Print Recommendation Plugin (to support Mopria printers)
- Extract common part of MDNSFilterPlugin to common utils, MDNSFilteredDiscovery.java (other vendors can use it too)
- Refactor Samsung Print Recomendation Plugin to use MDNSFilteredDiscovery.java
- Add Mopria devices detection to Samsung Print Recomendation Plugin

*Samsung Print Service Plugin supports Mopria printers since v3.00.161011.

Test: Tested manually. Test app was developed to make sure that Samsung Print Recommendation plugin can find both Samsung and Mopria devices. Additionally MDNSFilterPlugin was tested on HP printers.
Change-Id: Idc0d311171495f879564336370a86f7a8890378b
2016-11-23 13:26:48 +03:00
Jeff Davidson
fa8e6c0f5a Merge "Expose TelephonyManager#{set,get}DataEnabled."
am: 99d6227782

Change-Id: Iacdd6d802725ab1b45c273ad7c8de7c85c8cb801
2016-11-23 04:01:22 +00:00
Jeff Davidson
99d6227782 Merge "Expose TelephonyManager#{set,get}DataEnabled." 2016-11-23 03:55:27 +00:00
George Burgess IV
4cfb0f020f Merge "Fix static analyzer warnings."
am: 9c69c41b95

Change-Id: I62b951aa16a714343f155fa3af86f58933212ebb
2016-11-23 02:52:13 +00:00
Treehugger Robot
9c69c41b95 Merge "Fix static analyzer warnings." 2016-11-23 02:45:54 +00:00
Jakub Pawlowski
673c0e5596 Merge "Bluetooth: report proper advertiser status on error"
am: b509957e62

Change-Id: I1bb0a029a9044c3931e158c7ef02ffee4cb0f1cd
2016-11-23 01:58:03 +00:00
Treehugger Robot
b509957e62 Merge "Bluetooth: report proper advertiser status on error" 2016-11-23 01:51:52 +00:00
Jeff Davidson
40db40878e Expose TelephonyManager#{set,get}DataEnabled.
setDataEnabled requires MODIFY_PHONE_STATE or carrier privileges.
getDataEnabled will work with any of the above or
ACCESS_NETWORK_STATE.

Merged-In: I2d5a9df2e55f3f7be1729abefe137c00ae1d6c4e
Test: Exercised APIs from test app, updated and executed CTS tests
Change-Id: I2d5a9df2e55f3f7be1729abefe137c00ae1d6c4e
Fixes: 32644451
2016-11-22 17:28:57 -08:00
Jakub Pawlowski
76f517a173 Bluetooth: report proper advertiser status on error
When advertiser is not started because too many advertisers are
registered, return proper error code.

Bug: 30622771
Test: sl4a ConcurrentBleAdvertisingTest
Change-Id: I57384ff30132e9a7ee17dcf191ff89baa7abf1ef
2016-11-22 13:38:15 -08:00
Mark Salyzyn
7b25bb8ec7 jni: EventLog replace open coding with android_log_event_list
Test: manual confirm event log messages from services continue
Bug: 31992412
Bug: 31456426
Change-Id: I20a4228120c454d3e736dae8a927f1e0f9a62e37
2016-11-22 08:05:56 -08:00
Paul Duffin
0342ab5b94 Move JUnit classes from here into external/junit
Checked that android.test.runner had the same classes in as
before the change.

These classes are legacy 3.8.1 classes, they are not in 4.10 at
all. They appear to have been left here by accident. Looking at
the history it appears that at one time there were copies of
JUnit 3.8.1 junit.runner classes in frameworks and
external/junit. The classes here were upgraded to 4.10 but even
though these classes had been deleted immediately after 3.8.2
was released they were not removed, instead they appear to have
been reformatted as part of the upgrade. The external/junit
source was upgraded to 4.10 about two weeks later which seems to
have been done correctly. About three months after that the
classes here that were duplicates of those in external/junit
were removed from here leaving the legacy classes from 3.8.1.

I could not find any usages of these classes and they are not in
the public API so they can probably be removed altogether.
However, for now I will simply move them into external/junit as
described and remove them when upgrading JUnit there to 4.12.

Bug: 30188076
Test: Built android.test.runner and checkapi
Change-Id: I88687889315c041d999fe7e61b9652ac8406165c
2016-11-22 12:27:53 +00:00
Martijn Coenen
8c05ff96fb Merge "Add SystemProperties.reportSyspropChanged()."
am: 45c0c6939f

Change-Id: I83890872ba76161cf2f9a35b23861ab21b452a0f
2016-11-22 09:49:15 +00:00
Treehugger Robot
45c0c6939f Merge "Add SystemProperties.reportSyspropChanged()." 2016-11-22 09:43:23 +00:00
Peter Qiu
3aa7fdd19a Merge "wifi: hotspot2: add copy constructor for PasspointConfiguration"
am: 248c8311e8

Change-Id: I9a652a0f02f2895bde3ac9e4c332c80fc38b0df6
2016-11-22 01:37:00 +00:00
Ta-wei Yen
9b614baeab Merge "Make voicemail notification broadcast public"
am: 6a56326109

Change-Id: Ic094db50e40a0cd46251e27f84b2a98b9040a192
2016-11-22 01:32:00 +00:00
Treehugger Robot
248c8311e8 Merge "wifi: hotspot2: add copy constructor for PasspointConfiguration" 2016-11-22 00:03:43 +00:00
Treehugger Robot
6a56326109 Merge "Make voicemail notification broadcast public" 2016-11-21 22:23:13 +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
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
Treehugger Robot
67fe28d925 Merge "StrictMode to detect untagged network traffic." 2016-11-21 21:33:15 +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
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
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
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
Martijn Coenen
0754b27b56 Add SystemProperties.reportSyspropChanged().
To support notifying libutils of system property
changes.

Bug: 31262344
Test: builds
Change-Id: Iea77532eaa84d00f7d640edd1e3a1da66afdadc5
2016-11-21 17:57:13 +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
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
TreeHugger Robot
b9762351a3 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2016-11-21 01:32:02 +00:00
TreeHugger Robot
1ad0a421a6 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2016-11-21 01:31:41 +00:00
TreeHugger Robot
5770cc3c21 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2016-11-21 01:31:13 +00:00
TreeHugger Robot
dc92c70106 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2016-11-21 01:30:43 +00:00
TreeHugger Robot
81abcfea7b Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2016-11-21 01:30:07 +00:00
TreeHugger Robot
f94b944f80 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2016-11-21 01:29:47 +00:00
TreeHugger Robot
577b77a87a Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2016-11-21 01:29:17 +00:00
TreeHugger Robot
a4c8fe82e8 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2016-11-21 01:28:44 +00:00
TreeHugger Robot
9fb559183f Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2016-11-21 01:28:24 +00:00
TreeHugger Robot
c3ba50cc48 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2016-11-21 01:27:58 +00:00
TreeHugger Robot
0b555bb27d Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2016-11-21 01:27:25 +00:00
TreeHugger Robot
e450219549 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2016-11-21 01:26:55 +00:00
TreeHugger Robot
2b8d4b588a Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2016-11-21 01:26:09 +00:00
TreeHugger Robot
d0220f7863 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2016-11-21 01:23:59 +00:00
Bill Yi
ca112cfaeb Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 32177112
Change-Id: Ia328721b05af6cfe32f4494e89f6ee1645cb1deb
2016-11-20 15:49:28 -08:00
Bill Yi
18935bdfc9 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 32177112
Change-Id: I102b129ace5c7d97a6874aad995930b2f3cbdae6
2016-11-20 15:43:22 -08:00