Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
256,895 Commits 3 Branches 0 Tags
87f3aeeee2a9859cd312c3f1d8a18946cf8f582b
Commit Graph

256895 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bert McMeen
c3f20f30a1 Merge "Merge "docs: Refinements for testing" into mnc-io-docs am: 9da0730d66 am: feb0b87230" into nyc-dev am: 3dba0fbd53 
am: d76cc5d107

* commit 'd76cc5d10764d8e70b06229f6290bca9cd351fe1':
  docs: Refinements for testing

Change-Id: I305052f6a91abd43da83a62344ad668fe9061ed6
 2016-05-27 03:50:11 +00:00
Winson
12c962a1ac Defer calling the stack task removed callbacks. am: 6c8217ab30 
am: d5fada7253

* commit 'd5fada725331d3a01c955b984d7ac6132d27628f':
  Defer calling the stack task removed callbacks.

Change-Id: I28cfaa9860869aef42e8aa4bb4f721468f49588a
 2016-05-27 03:49:49 +00:00
Android Build Merger (Role)
1167f2b38b Merge "Merge "Updated link to material design page. am: ff05383baf am: ee44b14cd4" into nyc-dev am: 3106e71ddc am: 88c6e6da0a" into nyc-mr1-dev-plus-aosp 2016-05-27 03:48:17 +00:00
Jeff Sharkey
1ed6a87655 Merge "Suppress unlock notifications on non-FBE devices." into nyc-dev am: a39d888651 
am: 3f9059fb8d

* commit '3f9059fb8d3b16a71107383719a5c6360ea79acc':
  Suppress unlock notifications on non-FBE devices.

Change-Id: I08aeb77aea7c20ff8debc8c653d3eeea31ca99a3
 2016-05-27 03:48:15 +00:00
Android Build Merger (Role)
f33bfb3550 Merge "Merge "Change overdraw test to use windowbackground" into nyc-dev am: 34979a3af6 am: fa33b23ee8" into nyc-mr1-dev-plus-aosp 2016-05-27 03:48:10 +00:00
Android Build Merger (Role)
8433e0eb87 Merge "Merge "resolve merge conflicts of 7f7eec3 to nyc-dev" into nyc-dev am: 8d063a396f am: 302e608b73" into nyc-mr1-dev-plus-aosp 2016-05-27 03:48:01 +00:00
Android Build Merger (Role)
67e38c1e96 Merge "Merge "Fixed the relative time spoken with accessibility" into nyc-dev am: 38b5946fae am: 828d701667" into nyc-mr1-dev-plus-aosp 2016-05-27 03:47:52 +00:00
Android Build Merger (Role)
9bd29e0ece Merge "Merge "Use backstop timeouts on asynchronous countdown during preflight" into nyc-dev am: 210f2ff198 am: d61bd47a0d" into nyc-mr1-dev-plus-aosp 2016-05-27 03:47:45 +00:00
sreevanis
9ec9b8eb6a Merge "Updated link to material design page. am: ff05383baf am: ee44b14cd4" into nyc-dev am: 3106e71ddc 
am: 88c6e6da0a

* commit '88c6e6da0af911e718fce209ec7f550cb80549ab':
  Updated link to material design page.

Change-Id: If25cf5cd7e562fbafeb6da9814dfee69691aba78
 2016-05-27 03:46:54 +00:00
Adam Cohen
dd119052b6 Merge "Replace caribou wallpaper without the stars b/28339724" into nyc-dev am: b3d4ad2205 
am: 7eb7b41510

* commit '7eb7b41510f786df3f855b692995a45a1d5cc064':
  Replace caribou wallpaper without the stars b/28339724

Change-Id: Iba4348313b5fcd9950436ab8aff730a61bfbc75c
 2016-05-27 03:46:44 +00:00
John Reck
35f1b42421 Merge "Change overdraw test to use windowbackground" into nyc-dev am: 34979a3af6 
am: fa33b23ee8

* commit 'fa33b23ee81d91a5c344be60039f27590ed0b194':
  Change overdraw test to use windowbackground

Change-Id: Ib45ac99f10c3f511b54d1c8c5e06db141a125965
 2016-05-27 03:46:30 +00:00
Kevin Hufnagle
1b02f32a56 Merge "resolve merge conflicts of 7f7eec3 to nyc-dev" into nyc-dev am: 8d063a396f 
am: 302e608b73

* commit '302e608b732057d93ca2fd5941723829af3a1804':
  Cherry pick: docs: Edited "Features Reference" section in "<uses-feature>" page.

Change-Id: I3d547aa453a6d252d62e9851ee0f433b51873ff9
 2016-05-27 03:45:52 +00:00
Eric Schmidt
6f26362ed7 Merge "docs: Removing CLI steps in getting started docs" into mnc-io-docs am: 8e08dbe8f8 am: 400aed3556 am: 28bdf2907a 
am: 26ae893c03

* commit '26ae893c03f7f75c6b0afaac16c9d37075f28572':
  docs: Removing CLI steps in getting started docs

Change-Id: Ib6fb6f57dd8485b8e62796de5813351f6498082f
 2016-05-27 03:45:30 +00:00
Selim Cinek
b0f1031ae3 Merge "Fixed the relative time spoken with accessibility" into nyc-dev am: 38b5946fae 
am: 828d701667

* commit '828d70166742f11740f9a953164f984a32db5fa8':
  Fixed the relative time spoken with accessibility

Change-Id: I717e571849e293093e626a99e07ca307abee8f96
 2016-05-27 03:44:44 +00:00
Chris Tate
5c9ba8d4f3 Merge "Use backstop timeouts on asynchronous countdown during preflight" into nyc-dev am: 210f2ff198 
am: d61bd47a0d

* commit 'd61bd47a0ddcba11aca1e504b33c687aec91ab12':
  Use backstop timeouts on asynchronous countdown during preflight

Change-Id: Iab78fe56fd5d8faa3aa7b5220fa6b4d69f793325
 2016-05-27 03:44:10 +00:00
Android Build Merger (Role)
65a5650a1b Merge "Merge "Unlocked access of mServices is bad." into nyc-dev am: d9599faf6b am: 3b46f0e8a1" into nyc-mr1-dev-plus-aosp 2016-05-27 03:43:31 +00:00
Android Build Merger (Role)
ce6020f457 Merge "Merge "Reset slider animator on density change" into nyc-dev am: d52a81eeae am: f031dbe7b4" into nyc-mr1-dev-plus-aosp 2016-05-27 03:43:21 +00:00
Android Build Merger (Role)
18568baac4 Merge "Merge "Remove ActivityManager calls with PM.mInstallLock held" into nyc-dev am: a4dbdaf5e9 am: a32f7ac4a5" into nyc-mr1-dev-plus-aosp 2016-05-27 03:43:13 +00:00
Android Build Merger (Role)
3635088467 Merge "add redirect for Espresso Test Recorder doc that will soon be on TAC site. am: 8f60544180 am: e1bd7e15c5 am: 5d3ca78d3f am: 0a659f8480" into nyc-mr1-dev-plus-aosp 2016-05-27 03:43:05 +00:00
Android Build Merger (Role)
7b8a3eeee6 Merge changes from topic 'am-07760a7359434d758da865299f519df1' into nyc-mr1-dev-plus-aosp 
* changes:
  Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am: af0b4466ff am: 8940d2b0ff am: bb27626141 am: 6c35cf2434 am: 42a5983364 am: 75095e6f02 am: 7c625e1938 am: 54a62d5feb am: a5a2c88fb3 am: 7ff57eaff9 am: 94c8855da6 am: 50615e498e am: aa98ab568c
  DO NOT MERGE : backport of backup transport whitelist am: 647cb6a6d8  -s ours am: 077534b101 am: 4c559cdade am: 24ceca96af  -s ours am: 88c9eae886 am: 1fa817c057 am: 040cf14047 am: 0905c8f398  -s ours am: d39c0a8d77 am: d8e548f6ea
 2016-05-27 03:42:57 +00:00
Julia Reynolds
2b02ead69d Merge "Unlocked access of mServices is bad." into nyc-dev am: d9599faf6b 
am: 3b46f0e8a1

* commit '3b46f0e8a194d35e98c29f60679b3a1a915e44dd':
  Unlocked access of mServices is bad.

Change-Id: I78bbd3bb5f54b512740ce72e5168c605d2902fa5
 2016-05-27 03:42:15 +00:00
Julia Reynolds
f16590365b Merge "Reset slider animator on density change" into nyc-dev am: d52a81eeae 
am: f031dbe7b4

* commit 'f031dbe7b47f0af931bbc88b07edd40a3bbc7937':

Change-Id: I96d62f9bdf4d05115e080cdaddc62fa9ec76f730
 2016-05-27 03:41:16 +00:00
Fyodor Kupolov
b3c9ee1786 Merge "Remove ActivityManager calls with PM.mInstallLock held" into nyc-dev am: a4dbdaf5e9 
am: a32f7ac4a5

* commit 'a32f7ac4a51ffd520968f274de6f4ec0536fa322':

Change-Id: I2597e9f1a9d38f5c5021166c1f40d3a9d78e205c
 2016-05-27 03:39:45 +00:00
smain@google.com
25badd8e26 add redirect for Espresso Test Recorder doc that will soon be on TAC site. am: 8f60544180 am: e1bd7e15c5 am: 5d3ca78d3f 
am: 0a659f8480

* commit '0a659f8480657f736b7e5c79f6d630e57140ed9e':

Change-Id: Ib0cef6d68f8d5002a0223a991ed2b30991717020
 2016-05-27 03:39:11 +00:00
Paul Jensen
24c7ed7155 Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am: af0b4466ff am: 8940d2b0ff am: bb27626141 am: 6c35cf2434 am: 42a5983364 am: 75095e6f02 am: 7c625e1938 am: 54a62d5feb am: a5a2c88fb3 am: 7ff57eaff9 am: 94c8855da6 am: 50615e498e 
am: aa98ab568c

* commit 'aa98ab568cc3f7cba554b5bdb7fcd70a9b05ae61':

Change-Id: I2f311ce3ddb510f73c3d9e8d08991c8d5bd99a90
 2016-05-27 03:38:29 +00:00
Adam Lesinski
fc7c27b215 Merge "Fix issue where max idle time > total idle time" into nyc-dev 
am: 89046edb4d

* commit '89046edb4d64fe1c7662103cce3a82b69e05cfe4':
  Fix issue where max idle time > total idle time

Change-Id: I22908fb8f1c8ee7325687cebf646c3a03f6e1ea7
 2016-05-27 03:34:58 +00:00
Adrian Roos
59fd8dce39 Merge "Fix spurious crashes in StatusBarIconView" into nyc-dev 
am: 7fe83ab54e

* commit '7fe83ab54ebe52f9226ea3dbd5cfe9050996f7a3':
  Fix spurious crashes in StatusBarIconView

Change-Id: I46404e3903f17a5e2602502b5ac6554a255e30a8
 2016-05-27 03:34:53 +00:00
Roozbeh Pournader
51a8c19fb2 Merge "Ellipsize Preference summaries" into nyc-dev 
am: 0ca3829d4c

* commit '0ca3829d4c36c96099cd1d008036c252daf90b8e':
  Ellipsize Preference summaries

Change-Id: I2a787ec44b833cf03a9069b99bc79da957c562b2
 2016-05-27 03:34:47 +00:00
Wale Ogunwale
06fac4f77b Merge "Protect against NPE while to updating service connection activities." into nyc-dev 
am: cef12198a7

* commit 'cef12198a729209fc8bfb2b2483fb3730f0fd428':
  Protect against NPE while to updating service connection activities.

Change-Id: Ibeac7bcf9d2f85ac39d9b029cd429ae538ad8a99
 2016-05-27 03:34:42 +00:00
Robert Carr
c67c7c0799 Merge "Ensure surfaces only resize during relayout." into nyc-dev 
am: 58f1167ecf

* commit '58f1167ecf03c4cdce7e881ccf7c0e0506c14613':
  Ensure surfaces only resize during relayout.

Change-Id: Id7820d7ef5f8dfed7f67bc9ad524de3205c1f3f1
 2016-05-27 03:34:33 +00:00
Android Build Merger (Role)
e38bc45687 Merge "Merge "Fix Activity Transition mess-up." into nyc-dev am: bd34103c5d am: ff0298540b" into nyc-mr1-dev-plus-aosp 2016-05-27 03:32:04 +00:00
Christopher Tate
61af6f467b DO NOT MERGE : backport of backup transport whitelist am: 647cb6a6d8 -s ours am: 077534b101 am: 4c559cdade am: 24ceca96af -s ours am: 88c9eae886 am: 1fa817c057 am: 040cf14047 am: 0905c8f398 -s ours am: d39c0a8d77 
am: d8e548f6ea

* commit 'd8e548f6ea5e185bd0f9e22acef9355f5307245d':

Change-Id: I25c53c4fe1a0ece0d9c20e339f26a81f5cf62d78
 2016-05-27 03:32:02 +00:00
Garfield, Tan
f846d8518b Merge "Fix an assertion to avoid crash on deletions in Recent root." into nyc-dev 
am: 7a91029bff

* commit '7a91029bff3d31e56f12ae1c070ba78043e49e0a':
  Fix an assertion to avoid crash on deletions in Recent root.

Change-Id: Ibae8befa4b424b3da4bd43edb74afc28c5e30f96
 2016-05-27 03:31:40 +00:00
Robin Lee
8d27936438 Merge "Move VPN restriction check into setup dialog" into nyc-dev 
am: 32ceb9c801

* commit '32ceb9c801a86f901ec8230eec301c30e1deff3b':
  Move VPN restriction check into setup dialog

Change-Id: I214e3196b6aca565ff0f45bbca1f92d6d97fc4d2
 2016-05-27 03:31:34 +00:00
George Mount
621a2bad91 Merge "Fix Activity Transition mess-up." into nyc-dev am: bd34103c5d 
am: ff0298540b

* commit 'ff0298540bf737853b10859b74f3b5d979b2fe23':
  Fix toast with accessibility and app pinning

Change-Id: I05698e4b8883f31d92f627d55ae938b29e4a5818
 2016-05-27 03:31:31 +00:00
Jorim Jaggi
03d0a3aeff Merge "Handle trampoline activites in different tasks" into nyc-dev 
am: 0d35765ca3

* commit '0d35765ca343ae7b04df7a93c233e5b6860eec22':
  Handle trampoline activites in different tasks

Change-Id: I0f930e67f9cf179d7b819df9969979b12be0b929
 2016-05-27 03:31:26 +00:00
Michael Wright
c37fb8aa6e Merge "Finalize resource IDs for N." into nyc-dev 
am: 7bbab7e440

* commit '7bbab7e440c4968a5710d31f86168a4c8de66af9':
  Finalize resource IDs for N.

Change-Id: Ied7ef4d95a5ef5ad8100db724a6bc71f916f9f22
 2016-05-27 03:31:15 +00:00
Bert McMeen
d76cc5d107 Merge "Merge "docs: Refinements for testing" into mnc-io-docs am: 9da0730d66 am: feb0b87230" into nyc-dev 
am: 3dba0fbd53

* commit '3dba0fbd5388c367d00543331bc2125dd2871786':
  docs: Refinements for testing

Change-Id: I8f5bb3e78336a89074c2214dfa5fa270d37cc751
 2016-05-27 03:31:03 +00:00
Android Build Merger (Role)
c3137c85ee Merge "Merge "Prevent use of a null sCallbackObj by Hardware FLP" into nyc-dev am: 793ac34219 am: 8453136b8e" into nyc-mr1-dev-plus-aosp 2016-05-27 03:30:49 +00:00
Android Build Merger (Role)
231b1d7815 Merge "Merge "Prevent callbacks during DrawableContainer child initialization" into nyc-dev am: 0f1ae5fa0f am: 4e6cd80198" into nyc-mr1-dev-plus-aosp 2016-05-27 03:30:39 +00:00
Android Build Merger (Role)
e059382271 Merge "Merge "Fixing crash in SysUI due to invalid group." into nyc-dev am: 814358a24f am: d93090d916" into nyc-mr1-dev-plus-aosp 2016-05-27 03:30:27 +00:00
Android Build Merger (Role)
596512d47f Merge "Merge "Merge "Time to #NameAndroidN!" into nyc-dev am: 45caebe035" into nyc-mr1-dev am: a474cf8a90" into nyc-mr1-dev-plus-aosp 2016-05-27 03:30:17 +00:00
Android Build Merger (Role)
8c8b29a7ef Merge "Merge "Merge "Delay PACKAGE_RESTARTED until after data cleared." into nyc-dev am: d6ee899397" into nyc-mr1-dev am: 56f7a36c46" into nyc-mr1-dev-plus-aosp 2016-05-27 03:30:08 +00:00
Android Build Merger (Role)
f126df0e45 Merge "Merge "Update the light center when the root view\'s layout changed" into nyc-dev am: e78ba24c17 am: b076ee0a42" into nyc-mr1-dev-plus-aosp 2016-05-27 03:29:37 +00:00
Android Build Merger (Role)
ffe6e21073 Merge "Merge "AudioAttributes docs: warn about small buffer size with FLAG_LOW_LATENCY" into nyc-dev am: d34d06606d am: 4eccbbf926" into nyc-mr1-dev-plus-aosp 2016-05-27 03:29:26 +00:00
Wyatt Riley
a1ad1996a8 Merge "Prevent use of a null sCallbackObj by Hardware FLP" into nyc-dev am: 793ac34219 
am: 8453136b8e

* commit '8453136b8ee7ba361d4180df75328466292c9610':
  Fix Activity Transition mess-up.

Change-Id: I3904d1d8782c07f0a869243802c1e1dc8d6e49b1
 2016-05-27 03:29:22 +00:00
Android Build Merger (Role)
2272d8e462 Merge "Merge "Elaborate on requirement to support PreRebootSecurityLogs" into nyc-dev am: 1ad12e0678 am: 5ce70998d0" into nyc-mr1-dev-plus-aosp 2016-05-27 03:29:16 +00:00
Alan Viverette
2bc382b4a4 Merge "Prevent callbacks during DrawableContainer child initialization" into nyc-dev am: 0f1ae5fa0f 
am: 4e6cd80198

* commit '4e6cd801989e5de1f13d3db1050cbd48ee5be4f2':
  Prevent use of a null sCallbackObj by Hardware FLP

Change-Id: I88059295c45e5ef9091fa5a2a6b8ca7a0640f004
 2016-05-27 03:29:12 +00:00
Android Build Merger (Role)
d5eb34ad35 Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 9aed8c2fa0 -s ours am: 9f2ffbcd66 -s ours" into nyc-mr1-dev-plus-aosp 2016-05-27 03:29:09 +00:00
Winson Chung
0cdb2e74d6 Merge "Fixing crash in SysUI due to invalid group." into nyc-dev am: 814358a24f 
am: d93090d916

* commit 'd93090d916b5c526777a57717c99800999bdf850':
  Prevent callbacks during DrawableContainer child initialization

Change-Id: I54f2a3b4efc1073420dd84acff1c278c46161841
 2016-05-27 03:29:03 +00:00