summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Introduce forwarding intents across profiles.Nicolas Prevot2014-04-3014-1/+567
| | | | | | | | | | | | | The package manager service maintains, for some user ids, a list of forwarding intent filters. A forwarding intent filter is an intent filter with a destination (a user id). If an intent matches the forwarding intent filter, then activities in the destination can also respond to the intent. When the package manager service is asked for components that resolve an intent: If the intent matches the forwarding intent filter, and at least one activity in the destination user can respond to the intent: The package manager service also returns the IntentForwarderActivity. This activity will forward the intent to the destination. Change-Id: Id8957de3e4a4fdbc1e0dea073eadb45e04ef985a
* Merge "Create arch specific cache dirs during zygote startup."Narayan Kamath2014-04-301-0/+42
|\
| * Create arch specific cache dirs during zygote startup.Narayan Kamath2014-04-301-0/+42
| | | | | | | | | | | | | | | | The runtime expects them to exist before it's launched. The boot image / art files are created during the first zygote launch. Change-Id: I5ed0ad4854dc7785246344c8f6eaf54e560feb7d
* | Merge "Zen mode tweaks."John Spurlock2014-04-303-19/+55
|\ \
| * | Zen mode tweaks.John Spurlock2014-04-293-19/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | - Fix regression with alarms. - Run all condition provider callbacks on the main thread. - Exit zen mode if the current condition is disabled / uninstalled. Bug:14402762 Change-Id: I0746670c1910047a9dc9b7e29aa1a6c3899fd9fe
* | | am 4bf3c930: (-s ours) am 92bc0753: am 8c15cd0d: am c967d8dc: Add special ↵Deepanshu Gupta2014-04-300-0/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | system view cookie to OverflowButton. [DO NOT MERGE] * commit '4bf3c930684b1e697c87d3fdb520309c39e51b14': Add special system view cookie to OverflowButton. [DO NOT MERGE]
| * \ \ am 92bc0753: am 8c15cd0d: am c967d8dc: Add special system view cookie to ↵Deepanshu Gupta2014-04-301-1/+28
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OverflowButton. [DO NOT MERGE] * commit '92bc07534e511b9afa7edaffe867d2674c504d73': Add special system view cookie to OverflowButton. [DO NOT MERGE]
| | * \ \ am 8c15cd0d: am c967d8dc: Add special system view cookie to OverflowButton. ↵Deepanshu Gupta2014-04-301-1/+28
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [DO NOT MERGE] * commit '8c15cd0dc1d04490b82fd7d8da7611ff3219a1f0': Add special system view cookie to OverflowButton. [DO NOT MERGE]
| | | * \ \ am c967d8dc: Add special system view cookie to OverflowButton. [DO NOT MERGE]Deepanshu Gupta2014-04-301-1/+28
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c967d8dc62c429ecf3e27bf3714a953636e75cbf': Add special system view cookie to OverflowButton. [DO NOT MERGE]
| | | | * | | Add special system view cookie to OverflowButton. [DO NOT MERGE]Deepanshu Gupta2014-04-291-1/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a special view cookie to enable the IDE to identify the overflow menu button in the Action Bar. Change-Id: Ida3ed776afb8c9fa8af23b73d4cf6d47eef0ab87 (cherry picked from commit 674af92fd3a618695448ff88568b03390e90bc66)
* | | | | | | Merge "Turn off this very verbose log."Joe Onorato2014-04-291-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Turn off this very verbose log.Joe Onorato2014-04-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | adb shell dumpsys activity broadcasts has the last 100 broadcasts, so it can be used for debugging instead of spamming the main logs. Change-Id: I19c3ac72eb783999e615261da7f00b527d2bc06f
* | | | | | | | am f0a3ea6e: am c6ebc0d1: Merge "make success explicit in BT instrumentation ↵Guang Zhu2014-04-291-6/+9
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | util" into klp-modular-dev * commit 'f0a3ea6ea259f836c71007ab07966d9dd2a140d6': make success explicit in BT instrumentation util
| * | | | | | | am c6ebc0d1: Merge "make success explicit in BT instrumentation util" into ↵Guang Zhu2014-04-291-6/+9
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-modular-dev * commit 'c6ebc0d120bd7faa61d2f906f4a180c720f1f0d8': make success explicit in BT instrumentation util
| | * | | | | | Merge "make success explicit in BT instrumentation util" into klp-modular-devGuang Zhu2014-04-291-6/+9
| | |\ \ \ \ \ \
| | | * | | | | | make success explicit in BT instrumentation utilGuang Zhu2014-04-281-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6c8eb8cdb7928fa6a7c1bc96b374667d1d6ae6a1
* | | | | | | | | am ab583454: am 1866e5dc: am af40649e: Merge "Set NO_NEW_PRIVS on zygote init"Nick Kralevich2014-04-291-0/+10
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ab5834545da906f1a150672ead825c28a2e1f82a': Set NO_NEW_PRIVS on zygote init
| * | | | | | | | am 1866e5dc: am af40649e: Merge "Set NO_NEW_PRIVS on zygote init"Nick Kralevich2014-04-291-0/+10
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1866e5dc8bb04b58a67e54f66cb4ec22e878667d': Set NO_NEW_PRIVS on zygote init
| | * \ \ \ \ \ \ \ am af40649e: Merge "Set NO_NEW_PRIVS on zygote init"Nick Kralevich2014-04-291-0/+10
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'af40649e4ad506e312b53518cd2b9f2b58dee3ba': Set NO_NEW_PRIVS on zygote init
| | | * \ \ \ \ \ \ \ Merge "Set NO_NEW_PRIVS on zygote init"Nick Kralevich2014-04-291-0/+10
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Set NO_NEW_PRIVS on zygote initNick Kralevich2014-04-291-0/+10
| | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When app_process/zygote starts, make sure PR_SET_NO_NEW_PRIVS is set. This prevents zygote spawned apps from acquiring new privileges on exec. In particular, this allows the CTS test android.os.cts.SecurityFeaturesTest#testNoNewPrivs() to pass if ART is set as the default runtime. Change-Id: I81139cda999c7b1430242561aad28f566e9b6da0
* | | | | | | | | | | Merge "Move key attribute information into KeyEvent."Michael Wright2014-04-2912-331/+154
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Move key attribute information into KeyEvent.Michael Wright2014-04-2812-331/+154
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This consolidates all of the information that was in the native KeyEvent and the KeyLayout files into the managed KeyEvent class. It also moves the definition for all of the key names to the native side, rather than having them in both places. Change-Id: I172e3b554e7eb52c79ae2ec406ef4332e8b25ffa
* | | | | | | | | | | | Merge "Introduced basic animations for the new notifications."Selim Cinek2014-04-294-22/+315
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Introduced basic animations for the new notifications.Selim Cinek2014-04-304-23/+315
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Animations between two different states of the notification stack scroller are now possible. Bug: 14081264 Change-Id: I2b8e964095f71766feac5a76c4e3b85d22648d35
* | | | | | | | | | | | | Merge "Add IBatteryStats API to retrieve current charge times."Dianne Hackborn2014-04-294-21/+114
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Add IBatteryStats API to retrieve current charge times.Dianne Hackborn2014-04-294-21/+114
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also include charge/discharge information in dumpsys. Change-Id: Ica1b333ad334dc698d4a67da391b378757662f41
* | | | | | | | | | | | | | am 60037302: am 8fe27e88: Merge "Move logical address allocation logic into ↵Jinsuk Kim2014-04-291-49/+167
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | native service from HAL" into klp-modular-dev * commit '60037302208be033442cc3f3c50a25c7064ebbd1': Move logical address allocation logic into native service from HAL
| * | | | | | | | | | | | | am 8fe27e88: Merge "Move logical address allocation logic into native ↵Jinsuk Kim2014-04-291-49/+167
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | service from HAL" into klp-modular-dev * commit '8fe27e881851921a90882f7d4da142bf936c5549': Move logical address allocation logic into native service from HAL
| | * | | | | | | | | | | | Merge "Move logical address allocation logic into native service from HAL" ↵Jinsuk Kim2014-04-291-49/+167
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into klp-modular-dev
| | | * | | | | | | | | | | | Move logical address allocation logic into native service from HALJinsuk Kim2014-04-211-49/+167
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Logical address logic is independent from hardware, and the algorithm is standardized in the spec. Moved the logic to service so that all HAL implementations doesn't have to duplicated logic inside. Related change in HAL definition is in: https://googleplex-android-review.git.corp.google.com/#/c/447951/ Change-Id: I9699309719f3214fc2dbdf219faad484c0c1c5bf
* | | | | | | | | | | | | | | Merge "Add mechanism for Transitions to target a class."George Mount2014-04-294-28/+57
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Add mechanism for Transitions to target a class.George Mount2014-04-294-28/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 14289299 Added ability to target a specific class similarly to the mechanism for excluding a specific class in Transitions. Also changed XML tag from excludeTargetId to excludeId to make it symmetric with excludeClass. Change-Id: Ib371820ec75761243e75b659565b905b1b19c9a2
* | | | | | | | | | | | | | | | Merge "Transfer image of shared element to launched Activity."George Mount2014-04-297-28/+162
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Transfer image of shared element to launched Activity.George Mount2014-04-297-28/+162
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First pass of the API will use a Bitmap. Future versions will use more efficient mechanisms. Change-Id: I111474dd031fef0b86de871017c85dc679166acf
* | | | | | | | | | | | | | | | Merge "Prevent expanded notifications on lockscreen."Jorim Jaggi2014-04-292-12/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Prevent expanded notifications on lockscreen.Jorim Jaggi2014-04-292-12/+24
| | |_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9a0ffca823883cfed75d0e093f5a4364b20008b3
* | | | | | | | | | | | | | | | am 86af7745: (-s ours) am c2e5503d: (-s ours) Merge "Import translations. DO ↵Baligh Uddin2014-04-290-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" into klp-modular-dev * commit '86af7745d337f79b37e25e21f699bf04a46838be': Import translations. DO NOT MERGE
| * | | | | | | | | | | | | | | am c2e5503d: (-s ours) Merge "Import translations. DO NOT MERGE" into ↵Baligh Uddin2014-04-290-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-modular-dev * commit 'c2e5503dbae833065a16fe35296e202db3887920': Import translations. DO NOT MERGE
| | * | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into klp-modular-devBaligh Uddin2014-04-2930-85/+55
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-04-2830-85/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1d6579e5a984f30f7dd19dcb22d134645120ed8f Auto-generated-cl: translation import
* | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2014-04-2956-86/+616
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-04-2856-86/+616
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I87030c5f80cdb858f13de02988124e22ec6011ea Auto-generated-cl: translation import
* | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2014-04-2955-110/+55
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-04-2855-110/+55
| |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0759dcb477375df5e96160003f421821fb5ba371 Auto-generated-cl: translation import
* | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2014-04-2956-64/+150
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-04-2856-64/+150
| |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie48d7eaf59819fac2bcdc2a6d8a706a3bfa3c6dd Auto-generated-cl: translation import
* | | | | | | | | | | | | | | | | Merge "Add Transform and ClipBounds Transitions."George Mount2014-04-296-11/+299
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / |/| | | | | / / / / / / / / / / / | | |_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Add Transform and ClipBounds Transitions.George Mount2014-04-296-11/+299
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Made MoveImage use an overlay view. Drawables cover all Views in the overlay and there may be a desire to order the overlays. Change-Id: Ic7b81f0d26d8cce3f475c2eebbce01538bc55d46
* | | | | | | | | | | | | | | | Merge "Remove "speedbump" to expand notification with one finger."Jorim Jaggi2014-04-291-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | |