Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
266,851 Commits 3 Branches 0 Tags
23c2ec20b7ca01acbcc2c322256fe1afee62c8ea
Commit Graph

266851 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bart Sears
c51e725644 Revert "Remove ActivityManager calls with PM.mInstallLock held" 
This reverts commit ac06a4907b.

Change-Id: I27bedbd221a8d416b9040a96063e66a1ca69fe2e
 2016-05-27 04:18:50 +00:00
Android Build Merger (Role)
a19a6cc0b4 Merge "Merge "Added android:tools specification on navigation and actions page." into mnc-io-docs am: 4ca0c8052c am: fe33c063a9 am: 4b058ae5b7 am: 75fea11133" into nyc-mr1-dev-plus-aosp 2016-05-27 04:08:19 +00:00
Android Build Merger (Role)
ed5f73b124 Merge "Merge "Prevent setting the launch task id when docking." into nyc-dev am: 386a947616 am: 2e494ecc21" into nyc-mr1-dev-plus-aosp 2016-05-27 04:08:11 +00:00
Android Build Merger (Role)
b1aa5535d8 Merge "Merge "Only make Recents activity invisible if not focused on TV devices." into nyc-dev am: 20237bc68f am: b3c7e1c4f2" into nyc-mr1-dev-plus-aosp 2016-05-27 04:08:04 +00:00
Android Build Merger (Role)
31f191099f Merge "Merge "Fix issue where max idle time > total idle time" into nyc-dev am: 89046edb4d am: 7e762beb7f" into nyc-mr1-dev-plus-aosp 2016-05-27 04:07:48 +00:00
Android Build Merger (Role)
8d7fb0df41 Merge "Merge "Fix spurious crashes in StatusBarIconView" into nyc-dev am: 7fe83ab54e am: 63014c5f6c" into nyc-mr1-dev-plus-aosp 2016-05-27 04:07:29 +00:00
Sreevani Sreejith
db2530e24e Merge "Added android:tools specification on navigation and actions page." into mnc-io-docs am: 4ca0c8052c am: fe33c063a9 am: 4b058ae5b7 
am: 75fea11133

* commit '75fea11133d300d42891e57e260a5f33d28395f6':
  Added android:tools specification on navigation and actions page.

Change-Id: Ic636a52c5a8eaa9f0e8be80f2128c8678ecb20de
 2016-05-27 04:07:29 +00:00
Winson
c26b399b27 Merge "Prevent setting the launch task id when docking." into nyc-dev am: 386a947616 
am: 2e494ecc21

* commit '2e494ecc219052fbb4f91b290a83c2ef37a0dacf':
  Prevent setting the launch task id when docking.

Change-Id: I712a0e88ce8b7007126d484b5faa57c0d047027f
 2016-05-27 04:07:24 +00:00
Android Build Merger (Role)
e0ad40b5e7 Merge "Merge "Ellipsize Preference summaries" into nyc-dev am: 0ca3829d4c am: 77efbbb3c5" into nyc-mr1-dev-plus-aosp 2016-05-27 04:07:19 +00:00
Wale Ogunwale
fcc71813f7 Merge "Only make Recents activity invisible if not focused on TV devices." into nyc-dev am: 20237bc68f 
am: b3c7e1c4f2

* commit 'b3c7e1c4f2d700d5621219bde71a1fc095f15d1a':
  Only make Recents activity invisible if not focused on TV devices.

Change-Id: Idcef0671de44ac2076df2532fcc9241a82df10d9
 2016-05-27 04:07:18 +00:00
Android Build Merger (Role)
5fd350997d Merge "Merge "Protect against NPE while to updating service connection activities." into nyc-dev am: cef12198a7 am: e3190c206c" into nyc-mr1-dev-plus-aosp 2016-05-27 04:07:09 +00:00
Android Build Merger (Role)
aeb1d151c5 Merge "Merge "Ensure surfaces only resize during relayout." into nyc-dev am: 58f1167ecf am: 197f9e1c7e" into nyc-mr1-dev-plus-aosp 2016-05-27 04:06:59 +00:00
Adam Lesinski
ddf7f023fd Merge "Fix issue where max idle time > total idle time" into nyc-dev am: 89046edb4d 
am: 7e762beb7f

* commit '7e762beb7f7d91caece1737bc6712324a2544336':
  Fix issue where max idle time > total idle time

Change-Id: I309cbaf9744f43057c44ab89f29835bd1d1b1717
 2016-05-27 04:06:18 +00:00
Adrian Roos
f7621fa8fc Merge "Fix spurious crashes in StatusBarIconView" into nyc-dev am: 7fe83ab54e 
am: 63014c5f6c

* commit '63014c5f6cf5db310449994bb01b8fcf81c55e87':
  Fix spurious crashes in StatusBarIconView

Change-Id: I5baca4dfb9064eab68b0a2190804049a7d37aefa
 2016-05-27 04:06:15 +00:00
Roozbeh Pournader
2ecabac198 Merge "Ellipsize Preference summaries" into nyc-dev am: 0ca3829d4c 
am: 77efbbb3c5

* commit '77efbbb3c593f8a8100ec29814ec88fd2d94489d':
  Ellipsize Preference summaries

Change-Id: I4f4110a5f16c9e49f9571980861c7a67553cb2f0
 2016-05-27 04:06:07 +00:00
Wale Ogunwale
4c2dd01f0a Merge "Protect against NPE while to updating service connection activities." into nyc-dev am: cef12198a7 
am: e3190c206c

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

Change-Id: Iba9df7ad6a8bcb1448209b5c481811f2c5544fc6
 2016-05-27 04:06:02 +00:00
Rob Carr
14b29dfea9 Merge "Ensure surfaces only resize during relayout." into nyc-dev am: 58f1167ecf 
am: 197f9e1c7e

* commit '197f9e1c7efeabcc586e73b803cf29ed47f6e26e':
  Ensure surfaces only resize during relayout.

Change-Id: Ic893cdcd628932aa22fd947e1a0d0e3f60279889
 2016-05-27 04:05:54 +00:00
Android Build Merger (Role)
989d2e6b17 Merge "Merge "Fix an assertion to avoid crash on deletions in Recent root." into nyc-dev am: 7a91029bff am: 66f7553862" into nyc-mr1-dev-plus-aosp 2016-05-27 04:04:42 +00:00
Android Build Merger (Role)
2ae3428fd5 Merge "Merge "Move VPN restriction check into setup dialog" into nyc-dev am: 32ceb9c801 am: b4835e4f14" into nyc-mr1-dev-plus-aosp 2016-05-27 04:04:31 +00:00
Android Build Merger (Role)
fef5288111 Merge "Merge "Handle trampoline activites in different tasks" into nyc-dev am: 0d35765ca3 am: 1833aafe7f" into nyc-mr1-dev-plus-aosp 2016-05-27 04:04:21 +00:00
Android Build Merger (Role)
4d95771836 Merge "Merge "Finalize resource IDs for N." into nyc-dev am: 7bbab7e440 am: 66eeff63b7" into nyc-mr1-dev-plus-aosp 2016-05-27 04:04:11 +00:00
Android Build Merger (Role)
87f3aeeee2 Merge "Merge "Merge "docs: Refinements for testing" into mnc-io-docs am: 9da0730d66 am: feb0b87230" into nyc-dev am: 3dba0fbd53 am: 260167cada" into nyc-mr1-dev-plus-aosp 2016-05-27 04:03:59 +00:00
Garfield Tan
5eba42a3a6 Merge "Fix an assertion to avoid crash on deletions in Recent root." into nyc-dev am: 7a91029bff 
am: 66f7553862

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

Change-Id: Ic6355197bcfeb879aff7ede761aa56aa05687533
 2016-05-27 04:03:19 +00:00
Robin Lee
6ae136ce2b Merge "Move VPN restriction check into setup dialog" into nyc-dev am: 32ceb9c801 
am: b4835e4f14

* commit 'b4835e4f1442315cf251c82721482eb8e4ec8d0b':
  Move VPN restriction check into setup dialog

Change-Id: I815f0c0abb1bef0a4406adb42ff1fe048f098648
 2016-05-27 04:03:11 +00:00
Jorim Jaggi
cfefac6168 Merge "Handle trampoline activites in different tasks" into nyc-dev am: 0d35765ca3 
am: 1833aafe7f

* commit '1833aafe7f799761f9d6c8e02ed077342e3e1650':
  Handle trampoline activites in different tasks

Change-Id: Ic7cca7ab7be932771204dd5d21271015833d8177
 2016-05-27 04:03:01 +00:00
Akshay Thakker
3ba36776e0 Merge "Finalize resource IDs for N." into nyc-dev am: 7bbab7e440 
am: 66eeff63b7

* commit '66eeff63b719a6cb1e0c038df6687dc5555871fd':
  Finalize resource IDs for N.

Change-Id: Ia4e47b882bcfed6d4a8787849468d6c295bc6630
 2016-05-27 04:02:50 +00:00
Bert McMeen
6f609c484d Merge "Merge "docs: Refinements for testing" into mnc-io-docs am: 9da0730d66 am: feb0b87230" into nyc-dev am: 3dba0fbd53 
am: 260167cada

* commit '260167cada82f55272aabcf85da37effd2326c9e':
  docs: Refinements for testing

Change-Id: I3019173298bce29e130a13f21ddcc1dee6202b1b
 2016-05-27 04:02:36 +00:00
Android Build Merger (Role)
90fa062c1a Merge "Merge "Updated link to material design page. am: ff05383baf am: ee44b14cd4" into nyc-dev am: 3106e71ddc am: af7d6fa9a7" into nyc-mr1-dev-plus-aosp 2016-05-27 04:01:41 +00:00
Android Build Merger (Role)
81956e5fc6 Merge "Merge "Change overdraw test to use windowbackground" into nyc-dev am: 34979a3af6 am: 769c456bc1" into nyc-mr1-dev-plus-aosp 2016-05-27 04:01:31 +00:00
Android Build Merger (Role)
8e98306631 Merge "Merge "resolve merge conflicts of 7f7eec3 to nyc-dev" into nyc-dev am: 8d063a396f am: 9e2c84014f" into nyc-mr1-dev-plus-aosp 2016-05-27 04:01:20 +00:00
Android Build Merger (Role)
27432f0d60 Merge "Merge "Fixed the relative time spoken with accessibility" into nyc-dev am: 38b5946fae am: 0361d504da" into nyc-mr1-dev-plus-aosp 2016-05-27 04:01:02 +00:00
Android Build Merger (Role)
eced95f626 Merge "Merge "Use backstop timeouts on asynchronous countdown during preflight" into nyc-dev am: 210f2ff198 am: d9c9b591b7" into nyc-mr1-dev-plus-aosp 2016-05-27 04:00:51 +00:00
sreevanis
726681f117 Merge "Updated link to material design page. am: ff05383baf am: ee44b14cd4" into nyc-dev am: 3106e71ddc 
am: af7d6fa9a7

* commit 'af7d6fa9a708605f9af1579d06f7b8ce0615f23b':
  Updated link to material design page.

Change-Id: I0860fc89cf1eccc6b074d11d8ed46b960ed9b457
 2016-05-27 04:00:04 +00:00
sreevanis
75fea11133 Merge "Added android:tools specification on navigation and actions page." into mnc-io-docs am: 4ca0c8052c am: fe33c063a9 
am: 4b058ae5b7

* commit '4b058ae5b7519664efab552f9ce91a5fcf254a36':
  Added android:tools specification on navigation and actions page.

Change-Id: I36eddfe3419d165ef536e0ada8b684ce4a4e3ba4
 2016-05-27 04:00:02 +00:00
Winson
2e494ecc21 Merge "Prevent setting the launch task id when docking." into nyc-dev 
am: 386a947616

* commit '386a9476160ecd8d7d647d1a305126ec0917e0ab':
  Prevent setting the launch task id when docking.

Change-Id: Ifbf11755b04dc3e0be9c9a2c170d5aa178b3c4df
 2016-05-27 03:59:59 +00:00
Wale Ogunwale
b3c7e1c4f2 Merge "Only make Recents activity invisible if not focused on TV devices." into nyc-dev 
am: 20237bc68f

* commit '20237bc68fa32422fe256f75e331a4a3bdc3fd24':
  Only make Recents activity invisible if not focused on TV devices.

Change-Id: I98ed5ae3e4fd84033dca361d148d344fb28bc05a
 2016-05-27 03:59:53 +00:00
John Reck
397b124477 Merge "Change overdraw test to use windowbackground" into nyc-dev am: 34979a3af6 
am: 769c456bc1

* commit '769c456bc13f7c6b539e192fe01d1dcf788de0c4':
  Change overdraw test to use windowbackground

Change-Id: Ibd770a8021e879a2164dc1b10df3b5a8a93387e7
 2016-05-27 03:59:46 +00:00
Kevin Hufnagle
b402e3ea65 Merge "resolve merge conflicts of 7f7eec3 to nyc-dev" into nyc-dev am: 8d063a396f 
am: 9e2c84014f

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

Change-Id: I279fdda9500f6ee002955b8224ac1f9b4824b0d2
 2016-05-27 03:59:27 +00:00
Selim Cinek
e844788417 Merge "Fixed the relative time spoken with accessibility" into nyc-dev am: 38b5946fae 
am: 0361d504da

* commit '0361d504da7a842108218deed7610e26ba783089':
  Fixed the relative time spoken with accessibility

Change-Id: I52740a97b660f996f0212e4be7c363180cefb242
 2016-05-27 03:59:08 +00:00
Chris Tate
5295bc4ebd Merge "Use backstop timeouts on asynchronous countdown during preflight" into nyc-dev am: 210f2ff198 
am: d9c9b591b7

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

Change-Id: I1728d393ac230278baff2cccbaa32c1b457a286c
 2016-05-27 03:58:45 +00:00
Android Build Merger (Role)
364e2b07a5 Merge "Fix toast with accessibility and app pinning am: cf984c56ad am: 8e68533c9d" into nyc-mr1-dev-plus-aosp 2016-05-27 03:57:50 +00:00
Android Build Merger (Role)
522a19a330 Merge "Merge "Fix Activity Transition mess-up." into nyc-dev am: bd34103c5d am: b148f83ec0" into nyc-mr1-dev-plus-aosp 2016-05-27 03:57:38 +00:00
Android Build Merger (Role)
149ba9af6e Merge "Merge "Prevent use of a null sCallbackObj by Hardware FLP" into nyc-dev am: 793ac34219 am: a868723467" into nyc-mr1-dev-plus-aosp 2016-05-27 03:57:26 +00:00
Android Build Merger (Role)
144a044308 Merge "Merge "Prevent callbacks during DrawableContainer child initialization" into nyc-dev am: 0f1ae5fa0f am: ae2a646295" into nyc-mr1-dev-plus-aosp 2016-05-27 03:57:16 +00:00
Android Build Merger (Role)
626e587b56 Merge "Merge "Fixing crash in SysUI due to invalid group." into nyc-dev am: 814358a24f am: c1434b4559" into nyc-mr1-dev-plus-aosp 2016-05-27 03:57:05 +00:00
sreevanis
64b29d4f8c Merge "Added android:tools specification on navigation and actions page." into mnc-io-docs am: 4ca0c8052c am: fe33c063a9 
am: 4b058ae5b7

* commit '4b058ae5b7519664efab552f9ce91a5fcf254a36':
  Added android:tools specification on navigation and actions page.

Change-Id: I0d39f4cb2320ce7020d126734b442a1e8a877b60
 2016-05-27 03:56:49 +00:00
Jorim Jaggi
a5dd071a21 Fix toast with accessibility and app pinning am: cf984c56ad 
am: 8e68533c9d

* commit '8e68533c9d8b87122bdb07993b061113082a679f':
  Fix toast with accessibility and app pinning

Change-Id: I9028532f6e758ec947deda2ab76606042f896524
 2016-05-27 03:56:18 +00:00
George Mount
af0b74e906 Merge "Fix Activity Transition mess-up." into nyc-dev am: bd34103c5d 
am: b148f83ec0

* commit 'b148f83ec0f7b77e18d1e6c0d6072bedc19349f0':
  Fix Activity Transition mess-up.

Change-Id: I4bf8510cb21e4f35f1a935f2885b14bc511c47ac
 2016-05-27 03:55:43 +00:00
Android Build Merger (Role)
0c67994e33 Merge "Merge "Fix issue where max idle time > total idle time" into nyc-dev am: 89046edb4d am: fc7c27b215" into nyc-mr1-dev-plus-aosp 2016-05-27 03:55:25 +00:00
Wyatt Riley
726c1300a7 Merge "Prevent use of a null sCallbackObj by Hardware FLP" into nyc-dev am: 793ac34219 
am: a868723467

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

Change-Id: Iacb495c4c26c4d79042e91575b3f7cdfb84b6e5c
 2016-05-27 03:55:19 +00:00