summaryrefslogtreecommitdiffstats
path: root/services/core
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Remove FRP wipe support for device initializers" into mnc-devCraig Lafayette2015-06-181-27/+0
|\
| * Remove FRP wipe support for device initializersCraig Lafayette2015-06-111-27/+0
| | | | | | | | | | | | | | | | | | - Remove ManagedProvisioning NFC parameter key from DevicePolicyManager - Remove wipeIfAllowed from PersistentDataBlockManager Bug: 21558883 Change-Id: I59354b7bb1ef7e0b0346ff9a7d1654780231dff0
* | Merge "[ActivityManager] Fix index OOB when updating visible." into mnc-devWale Ogunwale2015-06-181-1/+6
|\ \
| * | [ActivityManager] Fix index OOB when updating visible.riddle_hsu2015-06-121-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If there is an Activity Z of Task T needs be visible but isn't running, and the process P of Z is existed, it will just to schedule launch Z. The problem will happen when P is died (e.g. kill itself) right before scheduleLaunchActivity. Once RemoteException is caught, startSpecificActivityLocked will try to restart the process and run cleanup procedure because the process record is existed (death recipient of P has not entered AMS yet). And assume task T contains X, Y, Z. X and Y have declared stateNotNeeded=true, so X and Y will be removed from task T. Now the size of task T changes from 3 to 1. And because activityNdx=2 when updating Z, the next round (--activityNdx) will have exception at activities.get(activityNdx): IndexOutOfBoundsException: Invalid index 1, size is 1 The ActivityRecord in TaskRecord is removed by below flow: ActivityStack.ensureActivitiesVisibleLocked ActivityStackSupervisor.startSpecificActivityLocked ActivityStackSupervisor.realStartActivityLocked ApplicationThreadProxy.scheduleLaunchActivity -> IPC fail ActivityManagerService.startProcessLocked ActivityManagerService.handleAppDiedLocked ActivityStackSupervisor.handleAppDiedLocked ActivityStack.handleAppDiedLocked ActivityStack.removeHistoryRecordsForAppLocked ActivityStack.removeActivityFromHistoryLocked task.removeActivity(r) -> mActivities.remove(r) There is also similar patch to solve the same problem: https://android-review.googlesource.com/143780/ Change-Id: Iac646bcb8ed3d3cfb2bda14e05e11abfcfe980d1
* | | Merge "Carefully select which DNS servers to send to netd" into mnc-devErik Kline2015-06-181-1/+45
|\ \ \
| * | | Carefully select which DNS servers to send to netdErik Kline2015-06-181-1/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Select only DNS servers that: - are reachable, according to routes in the LinkProperties, AND - have a "suitable" source address in the LinkProperites, meaning: - IPv4 DNS server: - only if LinkProperties has any IPv4 address - IPv6 link-local DNS server: - only if the server has a scopeId set - assume for now that LinkProperties has a suitable link-local address - IPv6 non-link-local DNS server: - only if LinkProperties has a global, preferred IPv6 address Bug: 19470192 Bug: 20733156 Change-Id: Ibd95f3f7b33a4fb6c36d1cea4adb63c99068f657
* | | | Fix IME window flickering during rotation.Seigo Nonaka2015-06-181-12/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was introduced by Ifd15736b163ab, performLayoutAndPlaceSurfacesLocked is called even if computeNewConfigurationLocked() returns non-null object. This is simply by mistake and now computeNewConfigurationLocked never returns null. The only case we need to care is that mDisplayReady is false, but there is nothing to do with that state. Thus simply removes if segments from computeNewConfiguration. Bug: 20823978 Change-Id: I527dfeddffb8d928d578f8d60d64f98557aa3dcb
* | | | Merge "Allow apps to hide the soft keyboard even in a transient state." into ↵Seigo Nonaka2015-06-181-1/+16
|\ \ \ \ | | | | | | | | | | | | | | | mnc-dev
| * | | | Allow apps to hide the soft keyboard even in a transient state.Seigo Nonaka2015-06-181-1/+16
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since I69b88989ae4d0fe056e9ab8d67d0a955dd10e6d9, we have asserted that the following test cases can pass with CTS. assertTrue(imm.showSoftInput( view, InputMethodManager.SHOW_IMPLICIT)); assertTrue(imm.hideSoftInputFromWindow(token, 0)); This CL fixes the test failure caused by I33dc6278fd892f26e56352722bf9449b8b102030 in the above CTS case. Note that the test failure occurs only when the application tries to close the software keyboard during IMMS#mInputShown and IMMS#mImeWindowVis are in a transiently inconsistent state. Bug: 21727232 Change-Id: I195a9f9644583cb1172f48801e87273ad8def850
* | | | Sync the Bluetooth name and address from the Bluetooth AdapterPavlin Radoslavov2015-06-181-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It looks like the synchronization of the Bluetooth name and address from the Bluetooth Adapter has been removed by the following commit without an explanation: Bluetooth LE background operation mode (2/2) As a result, the BluetoothManagerService.mAddress was always null. Bug: 20545952 Change-Id: I595f370e06e17b2c67ce511f793efdee7674598c
* | | | Merge "Make MediaSessionService not blocked by AudioService." into mnc-devDongwon Kang2015-06-171-7/+27
|\ \ \ \
| * | | | Make MediaSessionService not blocked by AudioService.Dongwon Kang2015-06-171-7/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backgroud: As noted in b/20823981, MediaSessionService calls some audio service methods while holding a lock and the audio service methods also talk to other system services. And, deadlock happens when the other system service fires another request to MediaSessionService while holding its lock. Example1) --- resolved by the change in MediaSessionRecord.java T1: MediaSessionService.dispatchAdjustVolumeLocked() -> MediaSessionRecord.adjustVolume() -> +++AudioServiceInternal.adjustSuggestedStreamVolumeForUid()+++ -> AudioService.adjustSuggestedStreamVolume() -> telecom.TelecomManager.isInCall() --- blocked by lock in TelecomManager. T2: telecom.ConnectionServiceWrapper.handleCreateConnectionComplete() -> MediaSession.setActive() -> MediaSessionRecord$SessionStub.setActive() -> MediaSessionService.updateSession() --- blocked by lock in MediaSessionService. Example2) --- resolved by the change in IAudioService.aidl T1: MediaSessionService.dispatchAdjustVolumeLocked() -> IAudioService.adjustSuggestedStreamVolume() -> AudioService.adjustSuggestedStreamVolume() -> telecom.TelecomManager.isInCall() --- blocked by lock in TelecomManager. T2: telecom.ConnectionServiceWrapper.handleCreateConnectionComplete() -> MediaSession.setActive() -> MediaSessionRecord$SessionStub.setActive() -> MediaSessionService.updateSession() --- blocked by lock in MediaSessionService. Here, this change prevents the deadlock by making related audio IPC oneway and calling the internal audio method without holding the lock. Bug: 20823981 Change-Id: I4c4b2fc796f23d83be67f7edaacd7496c145d985
* | | | | Merge "system_server: add two child chains to firewall" into mnc-devXiaohui Chen2015-06-173-27/+270
|\ \ \ \ \
| * | | | | system_server: add two child chains to firewallXiaohui Chen2015-06-173-27/+270
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is an attempt to speed up getting out of device idle. It groups uid firewall rules in these child chains so we can attach/detach a whole chain instead of individual uid rules. BUG:21446713 Change-Id: Ie8f392da2deabe7cc86a9ecf4ed080163861d41e
* | | | | | Fix issue #21814207 and issue #21814212 (alarm manager)Dianne Hackborn2015-06-178-163/+388
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue #21814207: AlarmManager.setAndAllowWhileIdle should also allow wake locks. Introduce a whole new infrastructure for providing options when sending broadcasts, much like ActivityOptions. There is a single option right now, asking the activity manager to apply a tempory whitelist to each receiver of the broadcast. Issue #21814212: Need to allow configuration of alarm manager parameters The various alarm manager timing configurations are not modifiable through settings, much like DeviceIdleController. Also did a few tweaks in the existing DeviceIdleController impl. Change-Id: Ifd01013185acc4de668617b1e46e78e30ebed041
* | | | | | Merge "high-frequency notification stats." into mnc-devChris Wren2015-06-178-114/+160
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | high-frequency notification stats.Chris Wren2015-06-178-114/+160
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Aggregate and then periodically report stats that are high-frequency because they are driven by app behavior, not user behavior. Reuse the NotificationUsageStats facility. Remove redundant stats. Lessen memory foot print. Enable in-memeory aggregates with small, bounded memory footprint. Bug: 20258744 Change-Id: I87e391419c53917fa13c68a56f8cdb40a7c8e548
* | | | | | Merge "Make sync settings restore more robust" into mnc-devMatthew Williams2015-06-162-25/+58
|\ \ \ \ \ \
| * | | | | | Make sync settings restore more robustMatthew Williams2015-06-162-25/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18506992 Parent Bug: 17967106 Introduce a new state for ContentResolver#getIsSyncable. This state specifies that an adapter should be disabled until explicitly turned on by ContentResolver#setSyncAutomatically(true). In this way we can restore disabled sync adapters and still allow them to run their initialization logic later on when they are re-enabled. Change-Id: I03fd1f994c4bc982bbc723154ba20bb252efdf80
* | | | | | | Merge "Make keysetmgrservice gurantees explicit." into mnc-devdcashman2015-06-162-35/+116
|\ \ \ \ \ \ \
| * | | | | | | Make keysetmgrservice gurantees explicit.dcashman2015-06-152-35/+116
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add exceptions/checks for keysetmgrservice interractions which *should* never happen, but would result in NPE or invalid metadata. Also handle mismatches between package and keyset metadata in packages.xml. Bug: 20128916 Change-Id: Ia0f63f78d232d9d8d9fbe4cd8e6cc3406e5192a7
* | | | | | | | Merge "CEC: Handle <Set Menu Language> message on playback devices" into mnc-devJinsuk Kim2015-06-162-0/+44
|\ \ \ \ \ \ \ \
| * | | | | | | | CEC: Handle <Set Menu Language> message on playback devicesTerry Heo2015-06-172-0/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 16819131, Bug: 21505123 Change-Id: I3dc6439c13c2ebe5591d9e27c0c86419ed440f9b
* | | | | | | | | Merge "Fix to only do pre boot receivers on upgrade." into mnc-devDianne Hackborn2015-06-161-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix to only do pre boot receivers on upgrade.Dianne Hackborn2015-06-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I mistakenly checked in a change that forced us to run pre boot receivers during every boot, which was intended to just be temporary for testing. Change-Id: I7890432f2d42deccef934c1503c3af4b55f59494
* | | | | | | | | | Merge "disable verbose logs from people notifications." into mnc-devChris Wren2015-06-161-10/+10
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | / / / / / | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | disable verbose logs from people notifications.Chris Wren2015-06-161-10/+10
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 20258744 Change-Id: Ifa3fb4f6aefaab4d6c669b1e60f8536515725c0f
* | | | | | | | Merge "Fix issue #21816660 (app standby), work on issue #20882522 (voice ↵Dianne Hackborn2015-06-161-23/+18
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | interact)" into mnc-dev
| * | | | | | | | Fix issue #21816660 (app standby), work on issue #20882522 (voice interact)Dianne Hackborn2015-06-151-23/+18
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue #21816660: More app standby abuse prevention We now apply the same rules for deciding when an app has counted as active when the screen is on as when the screen is off; the only change this really means is that we don't immediately count foreground services as making an app active both screen on as well as the existing behavior for screen off. Also small fix to how we switch into voice interaction mode that guarantees we immediately switch to the screen on state. Issue #20882522 VI: voice interactor service not restarted This fixes some problems in the framework, allowing it to be correctly restarted (and rolled by to the default voice interactor if appropriate). There are still some problems in system UI that leave things broken in some cases. Also small fix to how we switch into voice interaction mode that guarantees we immediately switch to the screen on state. Change-Id: Ie4fd098a2f5174a2c94f36d30427fb2a9db3d835
* | | | | | | | Merge "Remove dead hidden ConnectivityManager and NetworkInfo APIs." into ↵Paul Jensen2015-06-161-78/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-dev
| * | | | | | | | Remove dead hidden ConnectivityManager and NetworkInfo APIs.Paul Jensen2015-06-161-78/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - There are no callers of NetworkInfo.setIsConnectedToProvisioningNetwork(), so remove all the code that deals with mIsConnectedToProvisioningNetwork being true, including the two ConnectiviyManager APIs. - There are no callers of ConnectivityManager.getMobileRedirectedProvisioningUrl(), so remove the code that reads this URL. - There are no callers of ConnectivityManager.captivePortalCheckCompleted(), so remove this API which is currently a no-op. Change-Id: Ifa44c7553c7c45ebe261a2a124d9bf8d6f96c690
* | | | | | | | | Yet another user restriction.Jeff Sharkey2015-06-151-0/+2
| |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia2952da19cb974a6a9ba0271a298a10df58b8d18
* | | | | | | | Merge "Limit number of fingerprint templates that can be enrolled per device ↵Jim Miller2015-06-161-6/+16
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | user" into mnc-dev
| * | | | | | | Limit number of fingerprint templates that can be enrolled per device userJim Miller2015-06-151-6/+16
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change places an upper limit on the number of fingerprint templates that can be enrolled per account. This is done primarily for performance reasons, but may also be imposed by hardware and Trusted Execution Environment (TEE) reasons. Fixes bug 20731847 Change-Id: I5bc337698bef682cdf67940906d24842e1dffc28
* | | | | | | Merge "Clean up app-link verification policy" into mnc-devChristopher Tate2015-06-163-46/+64
|\ \ \ \ \ \ \
| * | | | | | | Clean up app-link verification policyChristopher Tate2015-06-153-46/+64
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If an app claims to be the official auto-verified app for any domain and thus the automatic handler for ACTION_VIEW / {http,https}://... intents naming that domain, then we require that it verify as the official app for *all* domains it purports to handle, even if the other domains are not flagged for verify. Bug 21335460 Change-Id: I3fdd8620defa31aea36ce738fa63ac94fc53c5f7
* | | | | | | Merge "Allow killApplicationWithAppId() on secondary users" into mnc-devMakoto Onuki2015-06-161-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Allow killApplicationWithAppId() on secondary usersMakoto Onuki2015-06-151-1/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 20949609 Change-Id: If0e766aeb3e8b4aa6aebed3b75bcedd75251e382
* | | | | | | Merge "Bluetooth energy: fix overflow in calculation" into mnc-devAdam Lesinski2015-06-161-0/+4
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Bluetooth energy: fix overflow in calculationAdam Lesinski2015-06-151-0/+4
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use longs instead of ints, because the energy values can get pretty high. Change-Id: I43e696ad9e5965c2e616b11920db5bfae5db1671
* | | | | | Fix issue #21813831: Need API for asking to be added to power whitelistDianne Hackborn2015-06-152-4/+2
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Add the API. Clean up a few related things. Change-Id: I190adad1812f36f6095b98a1001fedb94874e8b5
* | | | | Merge "Use HTTPS when fetching app link verification resources" into mnc-devChristopher Tate2015-06-151-2/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Use HTTPS when fetching app link verification resourcesChristopher Tate2015-06-121-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 20016932 Change-Id: I30b4e052795551f3048b3adf29cd89ec0501fce8
* | | | | Merge "Clear runtime permissions on package data reset." into mnc-devSvet Ganov2015-06-141-13/+41
|\ \ \ \ \
| * | | | | Clear runtime permissions on package data reset.Svet Ganov2015-06-131-13/+41
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | bug:21817488 Change-Id: I7c51fee5206e3bcb79951f237a71862f0752a709
* | | | | Merge "Add StorageEventListener.onDiskDestroyed()" into mnc-devMakoto Onuki2015-06-121-1/+15
|\ \ \ \ \
| * | | | | Add StorageEventListener.onDiskDestroyed()Makoto Onuki2015-06-121-1/+15
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | Bug 21336042 Change-Id: I226cf205191dd302ff8d5156f9ae0fe8fc5b2c2b
* | | | | Merge "More useful extras in disk/volume broadcasts." into mnc-devJeff Sharkey2015-06-121-8/+13
|\ \ \ \ \
| * | | | | More useful extras in disk/volume broadcasts.Jeff Sharkey2015-06-121-8/+13
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I594166cff332aaf72b2b6357ac6ed3e6e42cbc49
* | | | | | Merge "BatteryStats: Wifi energy data is sometimes wrong" into mnc-devAdam Lesinski2015-06-121-2/+11
|\ \ \ \ \ \
generated by cgit v1.1 at 2025-02-04 19:41:31 +0000