Commit Graph

285587 Commits

Author SHA1 Message Date
Android Build Merger (Role)
39a8cfd85b Merge "Merge "Bluetooth: Move Bluetooth battery stats tracking (1/2)" am: 7df4093371 am: a3fe28806e" into nyc-mr2-dev-plus-aosp 2017-05-09 19:48:50 +00:00
Ajay Panicker
e2591faa62 Merge "Bluetooth: Move Bluetooth battery stats tracking (1/2)" am: 7df4093371
am: a3fe28806e

Change-Id: I3bf50965a2d4087604e010718c2aee0f90ef4593
2017-05-09 19:44:46 +00:00
Ajay Panicker
79b8b354c8 Merge "Bluetooth: Move Bluetooth battery stats tracking (1/2)" am: 7df4093371
am: a3fe28806e

Change-Id: Ice5081d34ba731026e6f3b6d9c7a0156334ec705
2017-05-09 18:23:43 +00:00
Ajay Panicker
a3fe28806e Merge "Bluetooth: Move Bluetooth battery stats tracking (1/2)"
am: 7df4093371

Change-Id: Ie6a4af6f5ac48e529aaeee34d92f893e710d8278
2017-05-09 18:05:55 +00:00
Treehugger Robot
7df4093371 Merge "Bluetooth: Move Bluetooth battery stats tracking (1/2)" 2017-05-09 17:53:20 +00:00
Ajay Panicker
a43bd01bd1 Bluetooth: Move Bluetooth battery stats tracking (1/2)
Move Bluetooth battery stats tracking to AppScanStats for a more
unified tracking system.

Bug: 37720787
Test: cts-tradefed run cts-dev -m CtsIncidentHostTestCases -t com.android.server.cts.BatteryStatsValidationTest#testBleScans
      Perform BLE scan and check battery stats
Change-Id: Ie6c682374e6e258c291d3a11eede649c7747ef40
2017-05-09 17:52:36 +00:00
Erik Kline
9f76683c59 Merge "Refactor and improve logging." am: c3d41d5093
am: 8af8235bca

Change-Id: Id583ab11513ab86f85d1c4001cf36e74fc521753
2017-05-09 10:47:03 +00:00
Erik Kline
8af8235bca Merge "Refactor and improve logging."
am: c3d41d5093

Change-Id: I8ef193a9ee0f5bf04ae18620c1a68228ed7ed929
2017-05-09 10:40:29 +00:00
Paul Duffin
5d43c16797 Merge "Prepare for removal of junit and android.test classes from Android API (step 1)" am: b2ac85e76d
am: edefe593e3

Change-Id: I35a3d6230c92d892d5eb3936532929b28314273f
2017-05-09 10:36:03 +00:00
Treehugger Robot
c3d41d5093 Merge "Refactor and improve logging." 2017-05-09 10:33:51 +00:00
Paul Duffin
edefe593e3 Merge "Prepare for removal of junit and android.test classes from Android API (step 1)"
am: b2ac85e76d

Change-Id: I2c06dbace44b4578a6cd94cb62a3ae67e558aaaa
2017-05-09 10:29:59 +00:00
Paul Duffin
b2ac85e76d Merge "Prepare for removal of junit and android.test classes from Android API (step 1)" 2017-05-09 10:23:17 +00:00
Erik Kline
1fdc2e23b5 Refactor and improve logging.
Test: as follows
    - build
    - flashed
    - booted
    - "runtest frameworks-net" passed
    - "dumpsys connectivity" shows new log output
Bug: 32163131
Bug: 36504926

Change-Id: I14d6da18660223f7cace156cb6594ee18928a7b0
2017-05-09 17:29:47 +09:00
Hugo Benichi
44e9b81c54 Merge changes I4872f8ba,I92039f29,Iaad13e13 am: 767ac317e2
am: 717238a614

Change-Id: Id7ca8a16da5774a00517cfb60b877d181a358353
2017-05-09 06:23:46 +00:00
Hugo Benichi
717238a614 Merge changes I4872f8ba,I92039f29,Iaad13e13
am: 767ac317e2

Change-Id: Ibf618a27b2e5cfb3e8a69528dfecd275b33f0336
2017-05-09 06:14:47 +00:00
Hugo Benichi
767ac317e2 Merge changes I4872f8ba,I92039f29,Iaad13e13
* changes:
  NsdService: simple cleanups
  NsdService: test coverage for client requests.
  NsdManager: remove duplicated argument validation
2017-05-09 06:08:20 +00:00
Hugo Benichi
0f86b4480c NsdService: simple cleanups
This patch replace some SparseArray<Integer> with SparseIntArray, and
simplify a value lookup function by using indexOfValue().

Test: TODO
Bug: 37013369, 33298084
Change-Id: I4872f8baa2bb2ff456c7f848d3afe2e7bcc9892e
2017-05-09 10:49:34 +09:00
Hugo Benichi
ab5bdbf84e NsdService: test coverage for client requests.
Adding coverage for:
  - NsdManager client disconnection
  - in-flight request GC

Test: new test passes
Bug: 37013369, 33298084
Change-Id: I92039f297cf99352bbf4196797933d89c0b819ff
2017-05-09 10:49:33 +09:00
Hugo Benichi
ff3e6ccca1 NsdManager: remove duplicated argument validation
This patch simplifies argument validation in NsdManager public api and
regroup duplicated validation into common methods.

This makes stack traces more actionable as now specific errors will
cause the api to throw exception from specific methods, whereas before
IllegalArgumentException would be thrown from inside the same api method
for different reasons.

This patch also includes a couple of other small cleanups.

Test: $ runtest -x frameworks/base/tests/net/../NsdManagerTest.java
Bug: 37013369
Change-Id: Iaad13e13976e9bf8f508d7188f823f8184ac414b
2017-05-09 10:49:33 +09:00
Yi Kong
ca9988f0f9 Merge "Remove unused lambda captures" am: 1101f45613
am: c7ce115073

Change-Id: I284275ea9abc1eb1d6655372ddd27f9cb2eef4ab
2017-05-09 00:34:20 +00:00
Yi Kong
c7ce115073 Merge "Remove unused lambda captures"
am: 1101f45613

Change-Id: I371bd344d87a213393787a528121308c96c12d83
2017-05-09 00:28:46 +00:00
Yi Kong
1101f45613 Merge "Remove unused lambda captures" 2017-05-09 00:19:09 +00:00
Sergey Prigogin
a3460f2bb1 Merge "Fix a NPE with outlineProvider="none"" am: 46a4fbb2e4
am: 65d65ec14b

Change-Id: Iae0cc89cea82009620a75ac03de86a72ea20f1bb
2017-05-08 21:12:37 +00:00
Julius D'souza
6ab3ce1219 DO NOT MERGE: Add light sample filtering logic for devices with ambient light sensors that can be regularly obstructed. am: 5b8250964b
am: cc1435b7f3

Change-Id: If4b375aef8d90641d942b6e1e73d73cfcea6dc17
2017-05-08 21:05:10 +00:00
Sergey Prigogin
65d65ec14b Merge "Fix a NPE with outlineProvider="none""
am: 46a4fbb2e4

Change-Id: Ib14f6b5369d60c06a716b99dd0274872fc0d2a51
2017-05-08 21:01:07 +00:00
Julius D'souza
cc1435b7f3 DO NOT MERGE: Add light sample filtering logic for devices with ambient light sensors that can be regularly obstructed.
am: 5b8250964b

Change-Id: Ifbebbcba8838b83a5c2e7d6d815784733cc95618
2017-05-08 20:57:56 +00:00
Sergey Prigogin
46a4fbb2e4 Merge "Fix a NPE with outlineProvider="none"" 2017-05-08 20:44:12 +00:00
Paul Duffin
702d506d57 Prepare for removal of junit and android.test classes from Android API (step 1)
In preparation for removing junit and android.test classes from
the Android API this change adds explicit dependencies on junit
and/or legacy-android-test to ensure that modules will compile
properly once it is removed.

Care was taken to ensure that any targets that depended,
directly or indirectly, on android-support-test did not also
depend on junit or hamcrest as they conflict with the versions
embedded within android-support-test.

Bug: 30188076
Test: make checkbuild
Change-Id: Ice80a29b420061f5d0af6eb46426455abf890e5e
Merged-In: Ifc3ee3dc804074a3c572bf2600cfb1fe1b6fa749
2017-05-08 19:33:27 +01:00
Yi Kong
b2233821e1 Remove unused lambda captures
Test: build
Bug: 37752547
Change-Id: Id102e93fef06e9c818b27fa8a5c6218c319bdd30
2017-05-08 10:24:22 -07:00
Yang Ni
fd9f091995 Merge "Destroy Allocation right away on exception" am: 52bc790f61
am: a37bef769a

Change-Id: Id67163535eeaa36d1cd9edd34d19ed04858d62a2
2017-05-08 16:06:39 +00:00
Yang Ni
a37bef769a Merge "Destroy Allocation right away on exception"
am: 52bc790f61

Change-Id: I2724dd4adf68aa8330b10b8f596d9d7db3619e03
2017-05-08 16:00:34 +00:00
Yang Ni
52bc790f61 Merge "Destroy Allocation right away on exception" 2017-05-08 15:52:09 +00:00
Colin Cross
fb18f4cfed Merge "Convert libandroid and libandroid_runtime to Android.bp" am: d308803b82
am: 06a6e81c1d

Change-Id: Ib613e9f89275c2af534c0b341f6c1c14c9af819a
2017-05-06 02:25:51 +00:00
Colin Cross
06a6e81c1d Merge "Convert libandroid and libandroid_runtime to Android.bp"
am: d308803b82

Change-Id: I90804cba65863d6194d7dd683024b43297357f19
2017-05-06 02:19:49 +00:00
nharold
63a79edbe0 Merge changes from topic 'sms-files-move-opt-to-base' am: abcc43d86a
am: d38615b846

Change-Id: Ib24d0d0f98ca59684e64ea9a85dd230d17143cb8
2017-05-06 02:06:27 +00:00
Treehugger Robot
d308803b82 Merge "Convert libandroid and libandroid_runtime to Android.bp" 2017-05-06 02:02:45 +00:00
nharold
d38615b846 Merge changes from topic 'sms-files-move-opt-to-base'
am: abcc43d86a

Change-Id: Ib61b38a3fd065c3906e2e3f0863b83f2f4b740f4
2017-05-06 01:55:40 +00:00
nharold
abcc43d86a Merge changes from topic 'sms-files-move-opt-to-base'
* changes:
  Move newFromRil() function to a utility class
  Remove dependency on telephony-common from services/core
  Move OTASP_* Consts from ServiceStateTracker to TelephonyManager
  Port Utility Functions from DefaultPhoneNotifier
  Remove dependency on IccConstants from SmsManager
  Move files from frameworks/opt/telephony to frameworks/base
2017-05-06 01:45:38 +00:00
Nathan Harold
a65e544478 Move newFromRil() function to a utility class
Remove a dependency on frameworks/opt from SmsMessage for CDMA

-Code move to frameworks/opt/telephony../cdma/SmsMessageConverter

Bug: 33414487
Test: Manually verified GSM and CDMA SMS: MO and MT
Change-Id: I730d292c4aad6524b03b18c0751738a73a71ecf7
2017-05-05 18:11:11 -07:00
Nathan Harold
6354f8cd01 Remove dependency on telephony-common from services/core
After migrating all the dependencies from frameworks/opt/telephony
to frameworks/base, the dependency is no longer needed and should
never have been created in the first place. Happily removed.

Bug: 33414487
Test: compilation
Change-Id: I261da4c6b819b3c960ce56d2cab5c80cb34e852e
2017-05-05 18:11:11 -07:00
Nathan Harold
18e74566e4 Move OTASP_* Consts from ServiceStateTracker to TelephonyManager
-Move the OTASP_* constants from SST
-Update references to those constants in TelephonyRegistry

Bug: 33414487
Test: compilation
Change-Id: I9516a8dfa9623d69d7e051749815e91ed3d013fa
2017-05-05 18:11:10 -07:00
Nathan Harold
daae72b311 Port Utility Functions from DefaultPhoneNotifier
-Move static utility functions from frameworks/opt/telephony/
 ..DefaultPhoneNotifier to a new utility class in frameworks/base

-Update TelephonyRegistry to point to the new functions.

Bug: 33414487
Test: compilation
Change-Id: I36a113cb5122569d451ec3a2dfa71d72d590fa52
2017-05-05 18:11:10 -07:00
Nathan Harold
1bc2c54ff6 Remove dependency on IccConstants from SmsManager
-Redefine the length of the SmsRecord in SmsManager

Bug: 33414487
Test: compilation
Change-Id: I941085e96f45164152528c123102a59930859546
2017-05-05 18:11:10 -07:00
Nathan Harold
f3e659e286 Move files from frameworks/opt/telephony to frameworks/base
Bug: 37688438
Test: compilation, boot on aosp_bullhead
Merged-In: I44d3d6231943ae0e7c3de4ab302e0cdff987aefe
Change-Id: I44d3d6231943ae0e7c3de4ab302e0cdff987aefe
2017-05-05 18:11:02 -07:00
Colin Cross
5c5b7f0ed7 Convert libandroid and libandroid_runtime to Android.bp
See build/soong/README.md for more information.

Test: m -j checkbuild
Change-Id: Ie3c9c3d3c8c75ade36422d1e8ee0a5fe117e9091
Merged-In: Ie3c9c3d3c8c75ade36422d1e8ee0a5fe117e9091
(cherry picked from commit 3f8fd40f28)
2017-05-06 00:52:03 +00:00
Yifan Hong
31175a97b4 Merge changes from topic 'libvintf_cp' am: 9bd4c20764
am: 7fbbc2e85d

Change-Id: Id3ce69c9f0642b1aad8acb9512870b239e652e95
2017-05-06 00:28:09 +00:00
Yifan Hong
c62e73c6a4 Add compatibility matrices to VintfObject.report() am: 4463d991be
am: dd4156cb43

Change-Id: I877107d04b96038592a8aaf2c79aecdd316318f2
2017-05-06 00:26:53 +00:00
Yifan Hong
7fbbc2e85d Merge changes from topic 'libvintf_cp'
am: 9bd4c20764

Change-Id: I277b37789fdc78ed2dcb5c50c1fda9c40444a4e8
2017-05-06 00:18:51 +00:00
Yifan Hong
dd4156cb43 Add compatibility matrices to VintfObject.report()
am: 4463d991be

Change-Id: I26c78cca5e807ee291bdb097d11d5f4ac43bba29
2017-05-06 00:17:26 +00:00
Treehugger Robot
9bd4c20764 Merge changes from topic 'libvintf_cp'
* changes:
  android.os.VintfObject: add API for EDI.
  Add compatibility matrices to VintfObject.report()
2017-05-06 00:11:33 +00:00