OSDN Git Service
Ajay Panicker [Sat, 1 Apr 2017 03:33:41 +0000 (03:33 +0000)]
Merge "Bluetooth: Add additional BluetoothSocket logging to root cause errors" am:
985fe4cbd2
am:
7eaf518b71
Change-Id: I9d646bf060c704a652a646f68a963a3ef6b36134
Ajay Panicker [Sat, 1 Apr 2017 03:28:13 +0000 (03:28 +0000)]
Merge "Bluetooth: Add additional BluetoothSocket logging to root cause errors"
am:
985fe4cbd2
Change-Id: I81f642bae7fe8f1530db6474ebab26760c707fa3
Treehugger Robot [Sat, 1 Apr 2017 03:18:45 +0000 (03:18 +0000)]
Merge "Bluetooth: Add additional BluetoothSocket logging to root cause errors"
Jakub Pawlowski [Sat, 1 Apr 2017 02:19:06 +0000 (02:19 +0000)]
Merge "Fix advertise data size estimation" am:
5b2e9f40b4
am:
21bd8d5f2e
Change-Id: If730c290a7f6745615658edd405877b0441b7d0f
Jakub Pawlowski [Sat, 1 Apr 2017 02:13:41 +0000 (02:13 +0000)]
Merge "Fix advertise data size estimation"
am:
5b2e9f40b4
Change-Id: Ic6c0a5d5a988ebeedde333910281af54c026f428
Jakub Pawlowski [Sat, 1 Apr 2017 02:06:30 +0000 (02:06 +0000)]
Merge "Fix advertise data size estimation"
Jakub Pawlowski [Fri, 31 Mar 2017 23:49:13 +0000 (16:49 -0700)]
Fix advertise data size estimation
UUID in service data field can be 2, 4, or 16 bytes long.
Test: manual
Bug:
36553478
Change-Id: Ib5ba2d16065496ca311e8642a15a7ea6bc84d4c1
Ajay Panicker [Tue, 28 Mar 2017 21:28:27 +0000 (14:28 -0700)]
Bluetooth: Add additional BluetoothSocket logging to root cause errors
Bug:
34780400
Test: Code still compiles
Change-Id: I166842ecc6889f9ea403e7aa3678ed818cd80968
Mark Renouf [Fri, 31 Mar 2017 15:20:36 +0000 (15:20 +0000)]
Corrects CompactExtractEditLayout to account for systemWindowInsetBottom am:
d1a0d19794
am:
8f9a6c3e89
Change-Id: Ie5fa2c8d64befee4f776dff6a01395099f83e5d9
Tyler Gunn [Fri, 31 Mar 2017 15:18:30 +0000 (15:18 +0000)]
Merge "Add carrier config to hide merge button for IMS conference" am:
78b3cbe4e0
am:
ec22b62a3a
Change-Id: Ib3dd03021d74ab981d0d61e7013cea376ee4bc46
Mark Renouf [Fri, 31 Mar 2017 15:15:49 +0000 (15:15 +0000)]
Corrects CompactExtractEditLayout to account for systemWindowInsetBottom
am:
d1a0d19794
Change-Id: Ia0bdc13ac2e8f3e65aaa38a64b4af9409ffeaa21
Tyler Gunn [Fri, 31 Mar 2017 15:12:37 +0000 (15:12 +0000)]
Merge "Add carrier config to hide merge button for IMS conference"
am:
78b3cbe4e0
Change-Id: I8dbfda0871dd06cf446fa42debba955e18b4bf0f
Tyler Gunn [Fri, 31 Mar 2017 15:05:35 +0000 (15:05 +0000)]
Merge "Add carrier config to hide merge button for IMS conference"
Tyler Gunn [Fri, 31 Mar 2017 04:32:20 +0000 (04:32 +0000)]
Merge "Self Managed CS Implementation" am:
98fad21a8a
am:
9fab4ad9b3
Change-Id: I4e75f6c7f3cf5deb7e98dddb668be350d1c60dd9
Tyler Gunn [Fri, 31 Mar 2017 04:26:27 +0000 (04:26 +0000)]
Merge "Self Managed CS Implementation"
am:
98fad21a8a
Change-Id: I8c972f521270e6c973c2524a2684aa32a65ca0fd
Treehugger Robot [Fri, 31 Mar 2017 04:11:53 +0000 (04:11 +0000)]
Merge "Self Managed CS Implementation"
Tyler Gunn [Tue, 14 Mar 2017 01:15:15 +0000 (18:15 -0700)]
Self Managed CS Implementation
- Add API guide for developers giving an overview of what they need
to implement.
- Add @hide setLabel method in PhoneAccount; used when registering a
self-managed CS's phone account; we override it with their app label to
ensure they don't try to give themselves another name.
Test: Unit
Bug:
34159263
Change-Id: I0c890dc2feeb3ee438a80ed425db2aaf1f4c1fdd
Sohani Rao [Fri, 31 Mar 2017 01:56:35 +0000 (01:56 +0000)]
Merge "Introduce Authentication Failure reason codes" am:
e23b2c6c59
am:
1fc10c0729
Change-Id: I0ec86c921ce418230b95f462ba70dce6d7b1d3c0
Sohani Rao [Fri, 31 Mar 2017 01:51:30 +0000 (01:51 +0000)]
Merge "Introduce Authentication Failure reason codes"
am:
e23b2c6c59
Change-Id: I5e002f4b341f2a295ed6d8a2213bc9401fcde008
Treehugger Robot [Fri, 31 Mar 2017 01:43:50 +0000 (01:43 +0000)]
Merge "Introduce Authentication Failure reason codes"
Joel Scherpelz [Fri, 31 Mar 2017 00:50:35 +0000 (00:50 +0000)]
Merge "Partially revert "Add blocking and retrying wrappers for INetd uses."" am:
8b560611bf
am:
a084e3283f
Change-Id: Iefdd5394fbe33fe4ce9706ec587a76c8da4f5dd3
Joel Scherpelz [Fri, 31 Mar 2017 00:42:57 +0000 (00:42 +0000)]
Merge "Partially revert "Add blocking and retrying wrappers for INetd uses.""
am:
8b560611bf
Change-Id: I65e9137ae4c4f48e5484059244833edeab41f001
Sanket Padawe [Fri, 31 Mar 2017 00:33:35 +0000 (00:33 +0000)]
Merge "Disable voice call barring notification for Verizon." am:
e0f0f6ca4b
am:
fa9e00bde5
Change-Id: I3e24f255827e2d51ecbfb74a5f8b3cfcda7cbe82
Joel Scherpelz [Fri, 31 Mar 2017 00:28:11 +0000 (00:28 +0000)]
Merge "Partially revert "Add blocking and retrying wrappers for INetd uses.""
Sanket Padawe [Fri, 31 Mar 2017 00:23:28 +0000 (00:23 +0000)]
Merge "Disable voice call barring notification for Verizon."
am:
e0f0f6ca4b
Change-Id: Ia30a4e2dd76b5fcaced93ccbe16720c4ef808d2c
Sanket Padawe [Fri, 31 Mar 2017 00:01:29 +0000 (00:01 +0000)]
Merge "Disable voice call barring notification for Verizon."
Sohani Rao [Mon, 6 Feb 2017 22:02:17 +0000 (14:02 -0800)]
Introduce Authentication Failure reason codes
In order to differentiate between various reasons for authentication
failure, add reason codes. These will be hidden since we don't intend to
have API change.
Bug:
33245941
Test: Unit test
Change-Id: I7222520df18e54d684ba9e50ff95be5d46a7d70c
Sanket Padawe [Tue, 28 Mar 2017 22:26:13 +0000 (15:26 -0700)]
Disable voice call barring notification for Verizon.
Test: Manual
Bug:
31490566
Change-Id: I2cb9f9b08f54faa276ddef9df36725aa76337746
Merged-in: I2cb9f9b08f54faa276ddef9df36725aa76337746
Mark Renouf [Wed, 29 Mar 2017 20:08:21 +0000 (16:08 -0400)]
Corrects CompactExtractEditLayout to account for systemWindowInsetBottom
Percentage-base sizes involving screen height are incorrect for watch
devices with non 1:1 display metrics. These are round screens with an
inactive bottom portion. To maintain the correct proportions the
bottom inset must be added to the height.
BUG:
36728475
Change-Id: Ibe351d1db7964b4b89ce9a588c171cd8407e2a50
Robin Lee [Thu, 30 Mar 2017 16:12:34 +0000 (16:12 +0000)]
Merge "Move some VPN logic out of ConnectivityService" am:
ec86462033
am:
e61a30f635
Change-Id: I00ab618139fdeba2374021657d84de4827ed97a2
Robin Lee [Thu, 30 Mar 2017 16:08:50 +0000 (16:08 +0000)]
Merge "Move some VPN logic out of ConnectivityService"
am:
ec86462033
Change-Id: I212c2d6de1676ab65e6bbf34148d66e183d60c62
Robin Lee [Thu, 30 Mar 2017 16:00:39 +0000 (16:00 +0000)]
Merge "Move some VPN logic out of ConnectivityService"
Nathan Harold [Thu, 30 Mar 2017 03:44:12 +0000 (03:44 +0000)]
Merge "Change reserveSecurityParameterIndex() to take a remoteAddress" am:
d118826971
am:
6d3c10495e
Change-Id: If826b05dea2d3c14137ee5e34449b6d39af6cc10
Nathan Harold [Thu, 30 Mar 2017 03:39:46 +0000 (03:39 +0000)]
Merge "Change reserveSecurityParameterIndex() to take a remoteAddress"
am:
d118826971
Change-Id: Ie59322c4e80aab89d784a2fcb3edd6458677bbb7
Treehugger Robot [Thu, 30 Mar 2017 03:33:12 +0000 (03:33 +0000)]
Merge "Change reserveSecurityParameterIndex() to take a remoteAddress"
Jakub Pawlowski [Thu, 30 Mar 2017 03:30:42 +0000 (03:30 +0000)]
Merge "Hide periodic scanning" am:
ca7544ea15
am:
c06722e788
Change-Id: Ie0f3b4d162bec0a501f56f2324fec1c7d2ccbda7
Jakub Pawlowski [Thu, 30 Mar 2017 03:26:18 +0000 (03:26 +0000)]
Merge "Hide periodic scanning"
am:
ca7544ea15
Change-Id: Icedae1d34de063d6b708a30bdc6217d48ed373ef
Jakub Pawlowski [Thu, 30 Mar 2017 03:17:48 +0000 (03:17 +0000)]
Merge "Hide periodic scanning"
Joel Scherpelz [Thu, 30 Mar 2017 01:13:03 +0000 (01:13 +0000)]
Partially revert "Add blocking and retrying wrappers for INetd uses."
Direct access to Netd from the bluetooth process is disallowed by
SELinux policy. This change reverts to the old behavior where IpManager
interacts with NetdService indirectly via NetworkManagementService.
Bug:
36492299
This partially reverts commit
af39244a34f4449c12a5f925222c9bc8d8049320.
Change-Id: Icf20b1e24abf7dd3123760f8637928bde7afe06b
Nathan Harold [Wed, 29 Mar 2017 17:47:59 +0000 (10:47 -0700)]
Change reserveSecurityParameterIndex() to take a remoteAddress
To make the SPI reservation more semantically consistent with the
transform creation API, and to ensure that we always create SPI
reservations relative to a well-known remote, we should take the
SPI request relative to a remote (rather than to a destination).
This necessitates that we now consider direction separately, which
is used for keying the SA-Id.
Bug:
36073210
Test: compilation
Change-Id: I81e955c20128c1f8e04fd68eb26669561f827a78
Jakub Pawlowski [Thu, 30 Mar 2017 00:00:44 +0000 (17:00 -0700)]
Hide periodic scanning
Bug:
30622771
Test: manual
Change-Id: I5d786b13cf99287732e16769e2563ac7c4fe715c
Michael Plass [Thu, 30 Mar 2017 00:02:58 +0000 (00:02 +0000)]
Merge "Remove implementation of bssid hotlist" am:
62c5f64fa5
am:
37a1d983fe
Change-Id: I546410e5a0efbbdddee526cd494ba33a6eb1005b
Michael Plass [Wed, 29 Mar 2017 23:57:32 +0000 (23:57 +0000)]
Merge "Remove implementation of bssid hotlist"
am:
62c5f64fa5
Change-Id: I3744706b984da6ed123a4eea08312c75806adb8f
Nathan Harold [Wed, 29 Mar 2017 23:56:06 +0000 (23:56 +0000)]
Merge commit '
ce073d70bedc' into stage-aosp-master
am:
4fdc7d5ddd
Change-Id: I4bde8eedc986900096fc8429da2b195f907605c9
Treehugger Robot [Wed, 29 Mar 2017 23:50:01 +0000 (23:50 +0000)]
Merge "Remove implementation of bssid hotlist"
Nathan Harold [Wed, 29 Mar 2017 23:03:34 +0000 (16:03 -0700)]
Merge commit '
ce073d70bedc' into stage-aosp-master
Change-Id: I319034a5b77de5cf71de0e110bb17819fb907f1b
Pavlin Radoslavov [Wed, 29 Mar 2017 22:51:41 +0000 (22:51 +0000)]
Merge "Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()" am:
3c7fce3579
am:
25105f6561
Change-Id: I67601df54e55171e3d559b71258d99ad1e0a8c5d
Treehugger Robot [Wed, 29 Mar 2017 22:50:49 +0000 (22:50 +0000)]
Merge "Add a Skeleton IpSecService"
Pavlin Radoslavov [Wed, 29 Mar 2017 22:47:28 +0000 (22:47 +0000)]
Merge "Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()"
am:
3c7fce3579
Change-Id: Ic8483107e72a61e8b07f26f343e36254fe57cfd9
Treehugger Robot [Wed, 29 Mar 2017 22:41:13 +0000 (22:41 +0000)]
Merge "Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()"
Michael Plass [Mon, 27 Mar 2017 18:11:47 +0000 (11:11 -0700)]
Remove implementation of bssid hotlist
Test: Relevant unit tests pass
Bug:
30147676
Change-Id: I268907cc13ef21c0ba547722fe7c866ee4cdae5a
Koji Fukui [Wed, 29 Mar 2017 18:55:37 +0000 (18:55 +0000)]
Merge "Ignore toast request of pinning if request interval is too short" am:
1fcacf7736
am:
19e2bcd2a7
Change-Id: Ic11d7a0daf867a6ad2a78ce4a150b0b2555f5706
Koji Fukui [Wed, 29 Mar 2017 18:49:47 +0000 (18:49 +0000)]
Merge "Ignore toast request of pinning if request interval is too short"
am:
1fcacf7736
Change-Id: I2814c128db0f9eb42d1f35236ed57e35ad6c417c
Treehugger Robot [Wed, 29 Mar 2017 18:41:53 +0000 (18:41 +0000)]
Merge "Ignore toast request of pinning if request interval is too short"
Mukesh Agrawal [Wed, 29 Mar 2017 18:35:37 +0000 (18:35 +0000)]
Merge changes I5c16c650,I3151fb6b am:
55efea25f3
am:
ad2684ca3d
Change-Id: Ia0d1205b09b4770a4df46604d947c7be7aca8fb5
Jakub Pawlowski [Wed, 29 Mar 2017 18:34:40 +0000 (18:34 +0000)]
Merge "Bluetooth: fix comment wording" am:
6ba7c54a51
am:
eeedda1453
Change-Id: Ib0cdcf77d471c814651a157fc79c818f99923250
Nathan Harold [Thu, 2 Mar 2017 02:55:06 +0000 (18:55 -0800)]
Add a Skeleton IpSecService
-Add IpSecService with the necessary glue to connect to netd
-Add code to retrieve IpSecService from System Server
Bug:
34811227
Test: Service boots (and dumpsys works), more via b/
34811227
Merged-In: I4cdcb643421141202f77a0e2f87a37012de0cd92
Change-Id: I4cdcb643421141202f77a0e2f87a37012de0cd92
Tianjie Xu [Wed, 29 Mar 2017 18:30:05 +0000 (18:30 +0000)]
Merge "Report the temperature during an OTA update" am:
47c7e7f41a
am:
022682a721
Change-Id: Idb0514f5c83232c0e66b90cc7cd40d026d1cceb0
Mukesh Agrawal [Wed, 29 Mar 2017 18:30:00 +0000 (18:30 +0000)]
Merge changes I5c16c650,I3151fb6b
am:
55efea25f3
Change-Id: Ifaaae29780d905ffe9f82645d6d17dad478ba6a9
Jakub Pawlowski [Wed, 29 Mar 2017 18:28:44 +0000 (18:28 +0000)]
Merge "Bluetooth: fix comment wording"
am:
6ba7c54a51
Change-Id: I745973b35e5d756072bff1d0958470dc0f55f6ca
Tianjie Xu [Wed, 29 Mar 2017 18:25:11 +0000 (18:25 +0000)]
Merge "Report the temperature during an OTA update"
am:
47c7e7f41a
Change-Id: I3238939bd9535571de1532f34ca137eb3fec9dc2
Mukesh Agrawal [Wed, 29 Mar 2017 18:20:35 +0000 (18:20 +0000)]
Merge changes I5c16c650,I3151fb6b
* changes:
StateMachine: make toString() terser
utiltests: add script to run tests
Treehugger Robot [Wed, 29 Mar 2017 18:20:22 +0000 (18:20 +0000)]
Merge "Bluetooth: fix comment wording"
Tianjie Xu [Wed, 29 Mar 2017 18:16:44 +0000 (18:16 +0000)]
Merge "Report the temperature during an OTA update"
Pavlin Radoslavov [Fri, 24 Feb 2017 18:19:14 +0000 (10:19 -0800)]
Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()
This API can be used to enable the optional codecs, or disable them
and use only the mandatory SBC.
Internally, it is implemented by raising the SBC priority to
highest (so SBC will be used/selected), or reducing the SBC priority
to its default value (lowest).
Test: A2DP streaming and enabling/disabling/selecting optional codecs
Bug:
35873828
Change-Id: Ia82036ac33590a3a402b1f5a36102264d47a9029
Etan Cohen [Wed, 29 Mar 2017 17:14:04 +0000 (17:14 +0000)]
Merge "[AWARE] Remove Publish/Subscribe Count configuration" am:
5d81b9d67d
am:
9bc8e05da2
Change-Id: If90e1b691bff1ae6f6a13c59836ad210df38f6d6
Etan Cohen [Wed, 29 Mar 2017 17:08:51 +0000 (17:08 +0000)]
Merge "[AWARE] Remove Publish/Subscribe Count configuration"
am:
5d81b9d67d
Change-Id: I6f7545c6665d4381cdeed03290cf928bc21aef17
Etan Cohen [Wed, 29 Mar 2017 17:03:41 +0000 (17:03 +0000)]
Merge "[AWARE] Remove Publish/Subscribe Count configuration"
Jakub Pawlowski [Thu, 23 Mar 2017 05:53:18 +0000 (22:53 -0700)]
Bluetooth: fix comment wording
Test: manual
Bug:
30622771
Change-Id: I5a589c98553f35248b0d95d332e9f35774075b24
Etan Cohen [Wed, 29 Mar 2017 15:09:28 +0000 (15:09 +0000)]
Merge "[AWARE] Fix unit tests" am:
de8e09409b
am:
c24d7f781a
Change-Id: Id3901b3bec685b25297c36d19d9b23a035a00e0c
Etan Cohen [Wed, 29 Mar 2017 15:04:28 +0000 (15:04 +0000)]
Merge "[AWARE] Fix unit tests"
am:
de8e09409b
Change-Id: I563dc61839664a7b51c1fe44283f7dd18217b012
Etan Cohen [Wed, 29 Mar 2017 14:56:40 +0000 (14:56 +0000)]
Merge "[AWARE] Fix unit tests"
Koji Fukui [Thu, 6 Oct 2016 14:00:00 +0000 (23:00 +0900)]
Ignore toast request of pinning if request interval is too short
Symptom:
System crash happens if an application repeatedly requests to finish
itself in pinning state.
Root cause:
Toast for pinning state is shown when the application requests to
finish itself. Every toasts use file descripters and they consumes all
available file descripters. System crash happens because of file
descriptor shortage.
Solution:
Ignore toast request for pinning state if request interval is too short.
Bug:
34211454
Change-Id: I4c3b45825270ab96fcfb24723195e9189709c2ec
Calin Juravle [Wed, 29 Mar 2017 01:32:10 +0000 (01:32 +0000)]
Merge changes from topic 'dex' am:
f665781c74
am:
8a4afd3dad
Change-Id: Ieb7d998721404040c0d2be010896a5dd15a3458c
Calin Juravle [Wed, 29 Mar 2017 01:27:37 +0000 (01:27 +0000)]
Merge changes from topic 'dex'
am:
f665781c74
Change-Id: I31c202a56d8f92634cc1d5d84106e27cb8c23bfd
mukesh agrawal [Tue, 28 Mar 2017 03:26:38 +0000 (20:26 -0700)]
StateMachine: make toString() terser
The current implementation of the toString()
method calls dump(). This causes two problems:
1. toString() may return a large string. This
is at odds with the advice in the documentation
for Object.toString(), which says that the
returned String should be concise, and easy
to read.
2. The dump() method is overriden by many of the
StateMachine subclasses. Some of those subclasses
have dump() implementations that are expensive,
and/or have dependencies on other objects.
To resolve these problems, we simpify
StateMachine.toString().
Along the way: remove a stale comment about
implementing dump() using toString().
Note: only ran the StateMachine tests, since some
other tests are already failing.
Bug:
36661851
Test: tests/utiltests/runtests.sh \
-e class com.android.internal.util.StateMachineTest
Change-Id: I5c16c650f01178c4d018b6a65e4aa95fb905aff6
mukesh agrawal [Wed, 29 Mar 2017 01:19:49 +0000 (18:19 -0700)]
utiltests: add script to run tests
Make it easier to run the tests, so that more people
will run them.
Bug:
36698401
Test: tests/utiltests/runtests.sh \
-e class com.android.internal.util.StateMachineTest
Change-Id: I3151fb6b2f609f45c7d8154b51f13cce58ccdc13
Calin Juravle [Wed, 29 Mar 2017 01:19:57 +0000 (01:19 +0000)]
Merge changes from topic 'dex'
* changes:
Compile secondary dex files according to REASON_BACKGROUND_DEXOPT
Register secondary dex files for JIT profiling
Move DexLoadReporter out of LoadedApk
Set pm.BackgroundDexOptService as the source of true
Add missing return in DexManager
Update package use info when the app data is updated
Yifan Hong [Wed, 29 Mar 2017 00:44:01 +0000 (00:44 +0000)]
Merge "Add HidlSupport.java for utility methods for HIDL." am:
383391c5da
am:
75172f2909
Change-Id: I173a10744b83e144c19d5fc9167cac40d07aef92
Yifan Hong [Wed, 29 Mar 2017 00:39:58 +0000 (00:39 +0000)]
Merge "Add HidlSupport.java for utility methods for HIDL."
am:
383391c5da
Change-Id: If68b94a2b38a7665a739f2792b8e0acefe5037c1
Treehugger Robot [Wed, 29 Mar 2017 00:32:18 +0000 (00:32 +0000)]
Merge "Add HidlSupport.java for utility methods for HIDL."
Tianjie Xu [Tue, 28 Mar 2017 23:59:16 +0000 (16:59 -0700)]
Report the temperature during an OTA update
Bug:
32518487
Test: mma
Change-Id: I00494aff91b473ae54eff8d56910198f88083d40
Calin Juravle [Fri, 10 Mar 2017 02:41:10 +0000 (18:41 -0800)]
Compile secondary dex files according to REASON_BACKGROUND_DEXOPT
Test: adb shell cmd package bg-dexopt-job works for sercondary dex files
Bug:
32871170
Bug:
26719109
(cherry picked from commit
a70b1b120365976f5eeb7cb3f577f5f6ff7ad18e)
Merged-In: Iaee8071449c83e774b2fe331aaccfc5433856f4f
Change-Id: I2334e4d73a5acdd1106e913c59ddf642782f1eee
Calin Juravle [Tue, 14 Mar 2017 06:30:30 +0000 (23:30 -0700)]
Register secondary dex files for JIT profiling
Test: boot, and check that profiles get recorded for secondary dex files
Bug:
32871170
Bug:
26719109
(cherry picked from commit
f5a7bfc8d5f9e74d6fa1e5be3246e7b4cde65bf6)
Merged-In: I2de23ef44eee3f1783ae698821f1c6d88c66c9a6
Change-Id: Id9bbd630b8485dc17eeef846295458df5cfe446a
Yifan Hong [Mon, 27 Mar 2017 20:02:34 +0000 (13:02 -0700)]
Add HidlSupport.java for utility methods for HIDL.
The old .equals code uses Objects.deepEquals,
which does not handle for, e.g. ArrayList<byte[]>.
Create our own recursive HidlSupport.deepEquals
and deepHashCode method to handle these edge cases.
Bug:
36454147
Test: hidl_test_java
Change-Id: I56dc48985486b561263c260cf43aa90f30d581d0
Brad Ebinger [Tue, 28 Mar 2017 22:40:26 +0000 (22:40 +0000)]
Merge "Remove non-localized message" am:
ddbd256954
am:
70a09c00e5
Change-Id: I19c34a0ee59615ef8bf4d70fbeff993404929a57
Brad Ebinger [Tue, 28 Mar 2017 22:35:36 +0000 (22:35 +0000)]
Merge "Remove non-localized message"
am:
ddbd256954
Change-Id: Ia0fb7f8facca6d15485bf98f2a0538338a878962
Brad Ebinger [Tue, 28 Mar 2017 22:21:53 +0000 (22:21 +0000)]
Merge "Remove non-localized message"
Andreas Gampe [Tue, 28 Mar 2017 20:44:34 +0000 (20:44 +0000)]
Merge "ActivityManager: Allow DiskRead for wrap.sh determination" am:
cbcb388d82
am:
9f6dc54c29
Change-Id: Iaf7619a5161ce336316e9fcd395eabe368ad7302
Andreas Gampe [Tue, 28 Mar 2017 20:38:59 +0000 (20:38 +0000)]
Merge "ActivityManager: Allow DiskRead for wrap.sh determination"
am:
cbcb388d82
Change-Id: I5c293bcfb026f75c15fb2fa92b2ac7f796579747
Calin Juravle [Tue, 14 Mar 2017 02:02:32 +0000 (19:02 -0700)]
Move DexLoadReporter out of LoadedApk
The DexLoadReporter was part of LoadedApk in order to lazily initialize
it when the first class loader of the app was created. However there's
no real association between the two and doing the initialization in
LoadedApk buys us nothing.
Extract the reporter in its own class and set it to BaseDexClassLoader
during bindApplication stage.
Test: boot, and check that loaded dex files are reported
Bug:
32871170
Bug:
26719109
(cherry picked from commit
37dfc8ee3ec676a0f059a9f9f1ec5d273e78a502)
Merged-In: I9a0e734ae4c16d5d0979aa6d0061fbc9b6e144f6
Change-Id: I9a0e734ae4c16d5d0979aa6d0061fbc9b6e144f6
# Conflicts:
# core/java/android/app/LoadedApk.java
Calin Juravle [Thu, 16 Mar 2017 01:38:57 +0000 (18:38 -0700)]
Set pm.BackgroundDexOptService as the source of true
The real dexopt maintainance job is
com.android.server.pm.BackgroundDexOptService, and not
com.android.server.BackgroundDexOptJobService
Partial revert of commit
096d304ae3d85c1bfcda1a1d9cd4eb13d0815500.
Test: manual inspection
Bug:
36140426
(partial cherry picked from commit
91d40f1baa2eeed2aa68d2492e20650d5e71dab5)
Merged-In: I983ac91117f107282095fa7eefdbce08e0dcfce3
Change-Id: I983ac91117f107282095fa7eefdbce08e0dcfce3
# Conflicts:
# core/res/AndroidManifest.xml
#
services/core/java/com/android/server/pm/PackageManagerService.java
# services/java/com/android/server/SystemServer.java
Calin Juravle [Sat, 11 Mar 2017 02:24:33 +0000 (18:24 -0800)]
Add missing return in DexManager
Harmless issue but which can spam the logs.
Test: mostly manual since the check is buried deep inside and cannot be
verified accurately. I added another test to DexManager to stress that
code path and then checked the logs.
Bug:
36117123
(cherry picked from commit
2dfc1b3e125860221bc67835c2d5c99198a12f8a)
Merged-In: I1a878a200f3f726dfaa85f1bed1398acc8dce979
Change-Id: Ib2c034add2e8229b90eb4aaa0067d42d26798670
Calin Juravle [Thu, 23 Feb 2017 03:05:06 +0000 (19:05 -0800)]
Update package use info when the app data is updated
- clear usesByOtherApps flag when the package is updated
- delete secondary dex usage data when the app data is destroyed
Test: runtest -x .../PackageDexUsageTests.java
runtest -x .../DexManagerTests.java
Bug:
32871170
Bug:
35381405
(cherry picked from commit
99dd37b3c5262910150ef955d16a33d32da264dd)
Merged-In: I3a249b9e8680e745fa678c7ce61b4ae764078fb9
Change-Id: Ia8416e7232cda3e42a8dccd51cb152a237e0f317
Treehugger Robot [Tue, 28 Mar 2017 20:28:30 +0000 (20:28 +0000)]
Merge "ActivityManager: Allow DiskRead for wrap.sh determination"
Jakub Pawlowski [Tue, 28 Mar 2017 20:17:45 +0000 (20:17 +0000)]
Merge "Bluetooth API spelling fixes ("wether" -> "whether")" am:
81cef3aeb8
am:
5cca752a4b
Change-Id: I8b16cad8a35aef0be8f69f7ca45d54ff08402930
Jakub Pawlowski [Tue, 28 Mar 2017 20:12:46 +0000 (20:12 +0000)]
Merge "Bluetooth API spelling fixes ("wether" -> "whether")"
am:
81cef3aeb8
Change-Id: Ief280cbc9283ff1cabdd3c8e53fcabd47c7881b1
Tianjie Xu [Tue, 28 Mar 2017 20:03:32 +0000 (20:03 +0000)]
Merge "improve the format of locale argument when calling recovery" am:
032c7a0a18
am:
1cd3a93288
Change-Id: I341961293c992b682aea631750eb35ca7857396a
Jakub Pawlowski [Tue, 28 Mar 2017 20:01:30 +0000 (20:01 +0000)]
Merge "Bluetooth API spelling fixes ("wether" -> "whether")"
Tianjie Xu [Tue, 28 Mar 2017 19:53:45 +0000 (19:53 +0000)]
Merge "improve the format of locale argument when calling recovery"
am:
032c7a0a18
Change-Id: I54389601ac5234b872701762e928a3ea7ff2f307