summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Reset permissions and app links when clearing app preferences - ↵Svetoslav Ganov2015-07-231-12/+45
|\ | | | | | | framework" into mnc-dev
| * Reset permissions and app links when clearing app preferences - frameworkSvet Ganov2015-07-231-12/+45
| | | | | | | | | | | | bug:22359132 Change-Id: I198c0b1cd6c3dcb91fe560874a8502eb6b5f65b3
* | Merge "Shut down UiAutomationConnection without a lock held" into mnc-devSvetoslav Ganov2015-07-231-10/+17
|\ \
| * | Shut down UiAutomationConnection without a lock heldSvet Ganov2015-07-221-10/+17
| |/ | | | | | | | | | | bug:22599759 Change-Id: I90bca614960522269497127658c16b0bb6ec0476
* | Merge "Properly synchronize interactivity state." into mnc-devTim Kilbourn2015-07-231-5/+31
|\ \
| * | Properly synchronize interactivity state.Michael Wright2015-07-231-5/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Volatile doesn't provide any guarantees with respect to write visibility, so it's possible that PowerManager will tell InputManager about a change in interactivity state, but the actual dispatching thread will never observe it. Also, add logging about NativeInputManager state. Bug: 22422588 Change-Id: Ifc3add992b9009d920d80a0315ff89c9574be20d
* | | Merge "Ignore the active network scorer when checking for idleness" into mnc-devWenchao Tong2015-07-231-0/+11
|\ \ \
| * | | Ignore the active network scorer when checking for idlenessWenchao Tong2015-07-221-0/+11
| | | | | | | | | | | | | | | | | | | | Bug: 22667334 Change-Id: I97085e653c146eff148458440bbac0a2ac64d6d2
* | | | Merge "Avoid a deadlock between PMS and AppOpsService" into mnc-devAmith Yamasani2015-07-231-0/+5
|\ \ \ \
| * | | | Avoid a deadlock between PMS and AppOpsServiceAmith Yamasani2015-07-221-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't check for external storage access rights from MountService for system server. Otherwise there's a case where AppOpsService is locked and PackageManagerService calls into AppOps with its own lock held and is unable to do an AppOps check via this path. Bug: 22522725 Change-Id: Ib4cf914638905de391384aa5122e691c5a7140ec
* | | | | Merge "Revert "UsbDeviceManager: fix b/21429947 regression"" into mnc-devNick Kralevich2015-07-231-1/+4
|\ \ \ \ \
| * | | | | Revert "UsbDeviceManager: fix b/21429947 regression"Nick Kralevich2015-07-231-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This causes various problems with our testing infrastructure. This reverts commit b210026e3d5c955628ca8b8b9191ade08891e9ef. Bug: 22447614 Bug: 21429947 Change-Id: I57623e3d993e65b6ad89e7a7d28e9575cf638994
* | | | | | Merge "Grant record audio to system reco service by default" into mnc-devSvetoslav Ganov2015-07-231-0/+30
|\ \ \ \ \ \
| * | | | | | Grant record audio to system reco service by defaultSvetoslav2015-07-221-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:22668415 Change-Id: I0fec7cc671bb1cc3a13b870748fc8e110a11250e
* | | | | | | UsageStats: Reduce log spam during time changeAdam Lesinski2015-07-221-4/+15
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With lots of usage stats files, the log gets spammy when the time changes and we are moving files around. Bug:22549399 Change-Id: I9da39399b090066d52568dea6fc5b59aba063c5a
* | | | | | UsageStats: Gracefully handle corrupt filenamesAdam Lesinski2015-07-222-5/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not sure how useful this is, since renames should be atomic. If the filesystem is corrupt I'm sure other parts of the system will break. Good to be safe though! Bug:22172659 Change-Id: Iad339be2869d170bcf736c59feb93830a51905e1
* | | | | | Merge "Add a privileged permission to get user accounts" into mnc-devSvetoslav Ganov2015-07-221-1/+2
|\ \ \ \ \ \
| * | | | | | Add a privileged permission to get user accountsSvet Ganov2015-07-211-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:22602794 Change-Id: I6e5429f0eb5f2cb274d4740755070e588735e179
* | | | | | | Merge "Fix ATLAS_MAP_ENTRY_FIELD_COUNT" into mnc-devJohn Reck2015-07-221-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix ATLAS_MAP_ENTRY_FIELD_COUNTJohn Reck2015-07-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 22558805 Change a039182d6157bc0487df4ad8e373685c9dd7d662 reduced the size of an entry from 4 fields to 3, but failed to update the constant that determined the size of the java long[]. Because the long[] is blindly passed down through to native, this will result in reading past the end of the array as the size is no longer a multiple of the number of fields being read so the loop will not terminate until 1 iteration past the end. Change-Id: I2f8e26cec9a60b3a74739a3763203296be5f1fd6
* | | | | | | | Merge "UsbDeviceManager: fix b/21429947 regression" into mnc-devNick Kralevich2015-07-221-4/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | / / / / | | |_|/ / / / | |/| | | | |
| * | | | | | UsbDeviceManager: fix b/21429947 regressionNick Kralevich2015-07-221-4/+1
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As discussed in b/21429947 (commit 674019065bceb4150190bfb1aa63cda9de0a8560), MTP must always be enabled, even if access to the underlying MTP data is disabled. Otherwise, Android will not enumerate on the USB bus, and won't receive notifications from the kernel about USB state changes. This effectively prevents using MTP functionality on user builds, or on userdebug/eng builds with adb turned off. Always ensure that MTP is the default driver mode. Get rid of one use of the persistent property. The persistent property was already pulled from a number of devices, and as explained in commit fcf10f7c12cb3107bdfedce6f76a8c866d154f3c, the intent was that the persistent property would only hold the persistent adb state. Bug: 22447614 Bug: 21429947 Change-Id: I8b3690a1bafb7cea0d5a69d73c1065c7fc64c653
* | | | | | Merge "Miss USB device Interface from UsbManager.getDeviceList()." into mnc-devTim Kilbourn2015-07-221-0/+2
|\ \ \ \ \ \
| * | | | | | Miss USB device Interface from UsbManager.getDeviceList().wang.zhenyu2015-07-221-0/+2
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the scenario that you connect more than one device to android phone with an usb hub, when you attach the second device,mNewConfigurationis is still corresponded to the first device unless another mNewConfiguration is created by a new operation. However,before another mNewConfiguration is created,setInterfaces() in addUsbConfiguration() has already been executed. Problem is that mNewInterfaces has already been cleared when it finished endUsbDeviceAdded for the first device. As a result,the UsbInterface descriptor in the first device's Configuration descriptor is set to null. Bug: 22657587 Change-Id: I0ba4f07c809d07ebebed633e43c3ee8e2e4c5060
* | | | | | Merge "More info to support CTS, fix reconcile bug." into mnc-devJeff Sharkey2015-07-221-13/+10
|\ \ \ \ \ \
| * | | | | | More info to support CTS, fix reconcile bug.Jeff Sharkey2015-07-221-13/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Surface more details and commands for storage volumes to support CTS testing. Fix user reconciliation bug that skipped user setup on empty volumes. Bug: 22658804, 22633097 Change-Id: I4221312d1cce24d1f5a2c108095cf3cf471598ed
* | | | | | | Partially fix that beginning of animation is skippedJorim Jaggi2015-07-221-45/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When waiting for all the windows that belong to an activity, we skipped the main window, in case it didn't had a surface yet. This was a problem because with SurfaceViews: They set it's visibility extremely early in the app visibility change cycle. Then, they don't block with the callback to SurfaceHolder.Callback2.surfaceRedrawNeeded, so window manager thinks it has drawn the first frame already. We don't even have a surface for the main window yet, but we start the app transition already because we think the only interesting window for this app token is the SurfaceView, which has supposedly already drawn. Bug: 22207948 Change-Id: I2ddb274000fa08866e193f4fd8db3788fc55e0f1
* | | | | | | Merge "Fix issue #22612630: Ensure SMS/Call delivery during Doze" into mnc-devDianne Hackborn2015-07-221-0/+22
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Fix issue #22612630: Ensure SMS/Call delivery during DozeDianne Hackborn2015-07-211-0/+22
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add whitelist timeout for SMS. Change-Id: I3392093000ad177a93b6ef36fb18f0398a671423
* | | | | | Merge "Work on issue #22303510: Additional permissions aren't properly..." ↵Dianne Hackborn2015-07-222-18/+56
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | into mnc-dev
| * | | | | | Work on issue #22303510: Additional permissions aren't properly...Dianne Hackborn2015-07-212-18/+56
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...disabled after toggling them off Keep track of whether a permission that has been declared by an app was able to actually be installed in the system, along with an API to find this information so that system UI can tell whether that permission is of interest. Also clean up some of the permission debug output. Change-Id: If4541bedb857789b255bb18f03cad155dcda0b95
* | | | | | Merge "Fixed issue with not finding existing activity for background user" ↵Wale Ogunwale2015-07-221-4/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | into mnc-dev
| * | | | | | Fixed issue with not finding existing activity for background userWale Ogunwale2015-07-221-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We currently go through the list of existing activities to find a match for the launching intent so we can re-use the activity record if one already exist. However, we exit the search early once we run across an activity record that doesn't belong to the current foreground user. This will cause us to create duplicate activity records if the launching intent is for a backround user and an activity record already exist. Based on https://android-review.googlesource.com/#/c/159131 Bug: 22564256 Change-Id: I4b6d94059c11fd2e621e65c8ec2c99427c15b246
* | | | | | | Make FingerprintService more tolerant of fingerprintd crashes.Jim Miller2015-07-221-16/+15
| |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - attempt to restart fingerprintd on the next request - inform clients that the hardware isn't available and cancel listeners. Fixes bug 22492148 Change-Id: Ib27eaf7f197c6a4e6ed9b085602882904d6b794d
* | | | | | Merge "Add callback to voice interaction session for lockscreen shown" into ↵Jorim Jaggi2015-07-211-0/+22
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | mnc-dev
| * | | | | | Add callback to voice interaction session for lockscreen shownJorim Jaggi2015-07-211-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 22402726 Change-Id: Iaf83e2f2b0389d74b6ecf480aa91a34443803f7b
* | | | | | | Merge "Touch, wake and unlock" into mnc-devJorim Jaggi2015-07-214-45/+57
|\ \ \ \ \ \ \
| * | | | | | | Touch, wake and unlockJorim Jaggi2015-07-204-45/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add onFingerprintAcquired, so Keyguard can grab a wakelock to prevent the device from sleeping. - If we get a successful fingerprint, wake the device up, immediately dismiss the keyguard and tell PWM that we kicked off our frame that will represent the correct state. - PWM then waits for this frame to be drawn, and then turns on the screen, which results in unlocking directly to the previsouly opened app. Bug: 21855614 Change-Id: I5f43df17fa5e4e9c6a6392eef4a4590b07df4f96
* | | | | | | | Merge "Avoid NPE when no staged installs." into mnc-devJeff Sharkey2015-07-211-3/+12
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Avoid NPE when no staged installs.Jeff Sharkey2015-07-201-3/+12
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | listFiles() returns null instead of empty list; deal with it. Bug: 22608671 Change-Id: I60dabec31932af3cded915c6927a4c5e5c71775d
* | | | | | | Merge "Don't kill apps that are multi-user aware..." into mnc-devAmith Yamasani2015-07-211-0/+5
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Don't kill apps that are multi-user aware...Amith Yamasani2015-07-211-0/+5
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... when looking for background user apps that hold RECORD_AUDIO permission. On switching users, we kill any apps that might potentially be recording audio. But we don't want to kill critical apps that need to stay running because of multi-user aware services. Bug: 22564430 Change-Id: I6d9a684d4e044cc3018f0f8181a44aa143a3baeb
* | | | | | Merge "UsbDeviceManager: add back support for USB overlays" into mnc-devNick Kralevich2015-07-211-0/+21
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | UsbDeviceManager: add back support for USB overlaysNick Kralevich2015-07-201-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit fcf10f7c12cb3107bdfedce6f76a8c866d154f3c removed support for USB overlays. Add it back in, as some devices depend on it. Bug: 22062484 Bug: 21195124 Change-Id: I74d12699201355b07475744c641e31fdc4bb5a4a
* | | | | | Merge "Don't duplicate recent tasks of the same affinity." into mnc-devWale Ogunwale2015-07-211-5/+15
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Don't duplicate recent tasks of the same affinity.Wale Ogunwale2015-07-211-5/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In change 510e554283d3dc250f836cd3e4abc36d87319333 we stated limiting the number of document activity entries in recents by comparing the realActivity of the tasks. This compared was done for all tasks not just document tasks there by breaking the use of task affinity to remove tasks with the same affinity from recent task list. This change limits the compare of realActivity to just document tasks. Bug: 22564474 Bug: 18642190 Change-Id: Idc21ec311f194ab2005cb22380ca56303ae0ad94
* | | | | | Merge "TIF: Get or create the user state when failed to find existing one" ↵Jae Seo2015-07-201-46/+43
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | into mnc-dev
| * | | | | TIF: Get or create the user state when failed to find existing oneJae Seo2015-07-201-46/+43
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | Bug: 22560640 Change-Id: Idc56dc2b16319d173f005fc236f91f70d1a93fad
* | | | | Merge "MediaSessionRecord: do not hold a lock when calling ↵Dongwon Kang2015-07-201-27/+19
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | AudioSystem.isStreamActive" into mnc-dev
| * | | | | MediaSessionRecord: do not hold a lock when calling AudioSystem.isStreamActiveDongwon Kang2015-07-201-27/+19
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AudioSystem.isStreamActive() includes a blocking IPC, so it shouldn't be called in MSR.adjustVolume() which is called from MediaSessionService while holding a lock. Bug: 22606983 Change-Id: I3ab94e73731176d9bf80dbc2121702025547114c