summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add -round and -notround qualifier to android runtime/aaptAdam Lesinski2015-05-159-1/+208
| | | | | | | | The round qualifier denotes a device with a screen shape that is round. The qualifier shows up after the 'long/notlong' qualifier and before the orientation 'port/land/square' qualifiers. Change-Id: I3044258b2703a9165694b79725bade770fa6cea1
* Merge "Remove UID from kernel cpu accounting when uninstalled" into mnc-devAdam Lesinski2015-05-154-9/+47
|\
| * Remove UID from kernel cpu accounting when uninstalledAdam Lesinski2015-05-124-9/+47
| | | | | | | | | | Bug:20182139 Change-Id: I77d41570c6aa0efd927b7beb266ef249ed9abff1
* | Merge "Parse uid_cputime proc file" into mnc-devAdam Lesinski2015-05-159-286/+362
|\ \ | |/
| * Parse uid_cputime proc fileAdam Lesinski2015-05-129-286/+362
| | | | | | | | | | | | | | | | | | | | | | Instead of using the ProcessCpuTracker as the source of truth, we periodically poll the new uid_cputime kernel module for stats on all UID cpu time. TODO: Need to tell the kernel when to stop tracking UIDs (aka on package uninstall). Change-Id: Id1d251aae23ab53f7acc0aba3bca5118bc2c194a
* | Merge "Preserve ResolverDrawerLayout fully collapsed state across relayout" ↵Adam Powell2015-05-151-1/+8
|\ \ | | | | | | | | | into mnc-dev
| * | Preserve ResolverDrawerLayout fully collapsed state across relayoutAdam Powell2015-05-151-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a bug where a relayout that grows the size of ResolverDrawerLayout content would cause it to get stuck in a half-collapsed state. This could also lead to janky touch interaction behavior in onStopNestedScroll as it animates to the fully open/closed state after clicking in a descendant list. Bug 21202727 Change-Id: I5f0a8b19fc079c57fcf2be7c6fa7627b1cb12a3c
* | | Merge "Fix issue where GeofenceHardwareImpl can crash. -It can't be ↵David Christie2015-05-151-2/+5
|\ \ \ | | | | | | | | | | | | instantiated before looper thread is ready. Bug: 21185178" into mnc-dev
| * | | Fix issue where GeofenceHardwareImpl can crash.David Christie2015-05-151-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -It can't be instantiated before looper thread is ready. Bug: 21185178 Change-Id: I9e5434f7821c608a01bfd962c5482f6c2c2a022d
* | | | Merge "Clean-up broadcast receivers when component is disabled." into mnc-devWale Ogunwale2015-05-153-6/+75
|\ \ \ \
| * | | | Clean-up broadcast receivers when component is disabled.Wale Ogunwale2015-05-153-6/+75
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 15804187 Change-Id: Ib672f720bd5c8d81d3846568ef53f7723685f317
* | | | | Merge "Fix lost singleton provider after force-stopping user or package." ↵Olawale Ogunwale2015-05-151-2/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | into mnc-dev
| * | | | | Fix lost singleton provider after force-stopping user or package.riddle_hsu2015-05-151-2/+5
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Case 1 (name == null): Switch user from guest to owner. All processes of guest will be killed, it will not include processes which singleton components live in, but singleton provider records are still collected and removed. When the user switch is complete and the process of removed singleton provider is still alive, there is someone access the provider, it will create a new ContentProviderRecord and wait but no one will notify it because the provider process is alive with different ContentProviderRecord. Then the access cannot get response unless the process of target provider is died and restarted. Case 2 (name != null): Switch to another non-guest user, launch an application which contains singleton provider. Go to Settings to force-stop the package then switch back to owner user. Launch an application which will access the singleton provider. It will also cannot get response that similar as case 1. Solution: Only collect singleton provider if target user is all or owner. Change-Id: Ic6828da66645172d1378cfb1f66d092df5966516
* | | | | Merge "Also restart provider if there is external handle." into mnc-devOlawale Ogunwale2015-05-152-2/+6
|\ \ \ \ \
| * | | | | Also restart provider if there is external handle.riddle_hsu2015-05-152-2/+6
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e.g. ContentResolver.getType will call ActivityManagerService.getProviderMimeType that will not have connection but increase externalProcessNoHandleCount. Change-Id: I649c0b2390a749c77c6be5e7dfadc1acb689ec4c
* | | | | Merge "Invalidate old accessibility bounds on CONTENT_CHANGE" into mnc-devAlan Viverette2015-05-152-2/+22
|\ \ \ \ \
| * | | | | Invalidate old accessibility bounds on CONTENT_CHANGEAlan Viverette2015-05-152-2/+22
| | |/ / / | |/| | | | | | | | | | | | | | | | | | Bug: 20950124 Change-Id: Id19924358b538f9b7754de3a0c019433817dc1fc
* | | | | Merge "Fix testAuthNeeded test" into mnc-devChad Brubaker2015-05-151-1/+2
|\ \ \ \ \
| * | | | | Fix testAuthNeeded testChad Brubaker2015-05-151-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | begin now returns OP_AUTH_REQUIRED for per operations with per op authorization instead of NO_ERROR. (cherry-picked from commit b0addbaaf22b14200db602c41a5bd86847bdc0a9) Change-Id: I1f472125f46155833e03ab30bf18363ff51b2c58
* | | | | | Merge "Rename PostMessageToMainFrame to PostWebMessage" into mnc-devSelim Gurun2015-05-153-3/+3
|\ \ \ \ \ \
| * | | | | | Rename PostMessageToMainFrame to PostWebMessageSelim Gurun2015-05-153-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 20557074 There is no need to keep the name PostMessageToMainFrame since we may choose to not implement the special condition to posting to a named subframe. And if we want, we can do this by overloading the function. Change-Id: I9896ad479e1c30cda500352cfdb1b7d336383568
* | | | | | | Merge "Adjust light source for window position" into mnc-devAlan Viverette2015-05-1513-53/+105
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Adjust light source for window positionAlan Viverette2015-05-1413-53/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 16523629 Change-Id: I2f3fed1edcac0a3cfd5034aded45e08ececfebaf
* | | | | | | Merge "Remove "encrypt at rest" flag from new AndroidKeyStore API." into mnc-devAlex Klyubin2015-05-157-124/+14
|\ \ \ \ \ \ \
| * | | | | | | Remove "encrypt at rest" flag from new AndroidKeyStore API.Alex Klyubin2015-05-157-124/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This flag causes issues such as being unable to generate, import, or use keys when the user/profile secure lock screen credential hasn't yet been entered after boot. Bug: 18088752 Change-Id: I992f6dfdc945bcb83e341356a40dfa7d7bc143d8
* | | | | | | | Merge "Text selection: Fix moving by character when should move by word" ↵Mady Mellor2015-05-151-34/+34
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into mnc-dev
| * | | | | | | | Text selection: Fix moving by character when should move by wordMady Mellor2015-05-141-34/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code to restrict handles from crossing did not respect moving by word or by character. This CL checks the offset to see if it's crossing, and if it is, it restricts it to the line of the other handle and proceeds with determining the "actual" offset based on the activated mode by word / by char). There is also still a check to ensure that one character is selected after the mode as adjusted the offset. Bug: 21114827 Change-Id: Idac699ef2eb5d313e77d44b5064c03ff84e0fb88
* | | | | | | | | Merge "Fix difficulty grabbing handles for small selections" into mnc-devMady Mellor2015-05-151-2/+2
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Fix difficulty grabbing handles for small selectionsMady Mellor2015-05-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The gravity for the handles pushes them to the outside of the touch target square, causing the touch target to overlap for both of them when close together. This CL swaps the gravity so that the touch target does not overlap when the handles are close. Bug: 20065564 Change-Id: I4d14e7076ac779c5f4a0a603d6348ba6dc7c7b4c
* | | | | | | | | Merge "Revert "Fix IMMS#mInputShown state inconsistency."" into mnc-devYohei Yukawa2015-05-151-1/+0
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Revert "Fix IMMS#mInputShown state inconsistency."Yohei Yukawa2015-05-151-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 8d4a9117fbd0aaf03b8486ef920c73894a12cfcd. Because of a regression Bug 21161785. Bug: 21161785 Bug: 18722991 Bug: 20763994 Bug: 20764441 Bug: 20926844 Change-Id: If58612eda08764be0226832c0a73f03683889cdb
* | | | | | | | | am 7414f97a: am efd254b2: Doc change: fix urls, remove obsolete image.Dirk Dougherty2015-05-152-28/+29
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7414f97a04658858201760c3a60a9d8fa95042fa': Doc change: fix urls, remove obsolete image.
| * \ \ \ \ \ \ \ \ am efd254b2: Doc change: fix urls, remove obsolete image.Dirk Dougherty2015-05-152-28/+29
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'efd254b2f9246d4c259be7885ef344be745bc8bc': Doc change: fix urls, remove obsolete image.
| | * | | | | | | | | Doc change: fix urls, remove obsolete image.Dirk Dougherty2015-05-142-28/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I61ec972b1df2c3211da6e21ee4e4ec3319d0d02b
* | | | | | | | | | | am 3519ddfe: am de401c82: Doc change: More changes to distribute files, ↵Dirk Dougherty2015-05-1529-411/+687
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Google Services page update. * commit '3519ddfe07de5847332937c4a0ba29c0378fe26a': Doc change: More changes to distribute files, Google Services page update.
| * | | | | | | | | | am de401c82: Doc change: More changes to distribute files, Google Services ↵Dirk Dougherty2015-05-1530-413/+689
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | page update. * commit 'de401c82f58a9465593391fede942fe6ffd22ef1': Doc change: More changes to distribute files, Google Services page update.
| | * | | | | | | | | Doc change: More changes to distribute files, Google Services page update.Dirk Dougherty2015-05-1430-413/+689
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I047ff9165c5844075561b31e42f8127d8819aeb0
* | | | | | | | | | | Merge "Update button visibility as a final step in DayPickerView ↵Alan Viverette2015-05-151-0/+2
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | construction" into mnc-dev
| * | | | | | | | | | | Update button visibility as a final step in DayPickerView constructionAlan Viverette2015-05-141-0/+2
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously it was only updated when the page was turned, but that listener isn't called until the user turns the page. Bug: 20701637 Change-Id: I06faf59660cda0e19d57766f4afd141e4a389b18
* | | | | | | | | | | Merge "Revert "Strip PNG metadata"" into mnc-devAlan Viverette2015-05-155690-0/+0
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Revert "Strip PNG metadata"Alan Viverette2015-05-155690-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removing the color profiles significantly changed the appearance of some assets. This reverts commit fe1ca2c535816bf7528b8b77fb5c24f9db324671. Change-Id: I60d9b645eda927b0fc5adc8b2bd0902fb536208a
* | | | | | | | | | | | Merge "Fix easter egg setting validator to accept valid values" into mnc-devSvet Ganov2015-05-151-1/+10
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Fix easter egg setting validator to accept valid valuesSvet Ganov2015-05-151-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:21188928 Change-Id: I5f6d445aad7231a907026c552c87f9cdfe024d32
* | | | | | | | | | | | Merge "Camera2: get ride of sceneModeOverrides in API doc" into mnc-devZhijun He2015-05-152-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | |
| * | | | | | | | | | | Camera2: get ride of sceneModeOverrides in API docZhijun He2015-05-142-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sceneModeOverrides isn't public API. Bug: 20152738 Change-Id: I4024b152c47c1d0184971539c99a2f1cc1b1c1a0
* | | | | | | | | | | | Merge "Change AudioDevicesInfo.getFormats() to getEncodings()." into mnc-devPaul McLean2015-05-153-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Change AudioDevicesInfo.getFormats() to getEncodings().Paul McLean2015-05-143-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id5115853744cd945bee5fee2601d9febc953208f
* | | | | | | | | | | | | Merge "Add bluetooth permission annotations" into mnc-devTor Norbye2015-05-156-1/+69
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Add bluetooth permission annotationsTor Norbye2015-05-156-1/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5bc86f8ec6ea5c873f1e14dab0e0c47c5c9df7f7
* | | | | | | | | | | | | | Merge "Remove hidden/deleted APIs." into mnc-devGeorge Mount2015-05-154-75/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \