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
Android Build Merger (Role)
7f65fca112 Merge "Merge "Fix spurious crashes in StatusBarIconView" into nyc-dev am: 7fe83ab54e am: 59fd8dce39" into nyc-mr1-dev-plus-aosp 2016-05-27 03:55:16 +00:00
Android Build Merger (Role)
daaa2eed9a Merge "Merge "Ellipsize Preference summaries" into nyc-dev am: 0ca3829d4c am: 51a8c19fb2" into nyc-mr1-dev-plus-aosp 2016-05-27 03:55:07 +00:00
Android Build Merger (Role)
6e5260f24f Merge "Merge "Protect against NPE while to updating service connection activities." into nyc-dev am: cef12198a7 am: 06fac4f77b" into nyc-mr1-dev-plus-aosp 2016-05-27 03:54:59 +00:00
Alan Viverette
b53dea88c7 Merge "Prevent callbacks during DrawableContainer child initialization" into nyc-dev am: 0f1ae5fa0f 
am: ae2a646295

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

Change-Id: I2953ce50d4bb64a4587491bbf152379c04ec8689
 2016-05-27 03:54:57 +00:00
Android Build Merger (Role)
61903f9151 Merge "Merge "Ensure surfaces only resize during relayout." into nyc-dev am: 58f1167ecf am: c67c7c0799" into nyc-mr1-dev-plus-aosp 2016-05-27 03:54:51 +00:00
Winson Chung
28f356f05e Merge "Fixing crash in SysUI due to invalid group." into nyc-dev am: 814358a24f 
am: c1434b4559

* commit 'c1434b455916dc102ea61c293d90021ae8e84c04':
  Fixing crash in SysUI due to invalid group.

Change-Id: Ief9b53c8d500ad213cf9cc771bc655eb5f282b9a
 2016-05-27 03:54:34 +00:00
Adam Lesinski
408002879c Merge "Fix issue where max idle time > total idle time" into nyc-dev am: 89046edb4d 
am: fc7c27b215

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

Change-Id: Ie247488ca42fbd3c214a7c493ac17dea74c9dde4
 2016-05-27 03:54:15 +00:00
Adrian Roos
869fa28697 Merge "Fix spurious crashes in StatusBarIconView" into nyc-dev am: 7fe83ab54e 
am: 59fd8dce39

* commit '59fd8dce39b12ed3055fc17ab09c6bcf5d1c3c0a':
  Fix spurious crashes in StatusBarIconView

Change-Id: I83bb9580dc834ae9b490328aea9a1ab99416065f
 2016-05-27 03:54:10 +00:00
Roozbeh Pournader
c680b76894 Merge "Ellipsize Preference summaries" into nyc-dev am: 0ca3829d4c 
am: 51a8c19fb2

* commit '51a8c19fb26103a0c1205ebc69b3dfcca3ab5b40':
  Ellipsize Preference summaries

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

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

Change-Id: Ibdb5d96f6678ec75e597312371ca9b8f7e8d084b
 2016-05-27 03:53:58 +00:00
Rob Carr
b4f8d09b28 Merge "Ensure surfaces only resize during relayout." into nyc-dev am: 58f1167ecf 
am: c67c7c0799

* commit 'c67c7c079915946c9ae100ed02982a826ec06e3a':
  Ensure surfaces only resize during relayout.

Change-Id: I06c2e7eca16710a3296264754f96880995e9e51b
 2016-05-27 03:53:48 +00:00
Android Build Merger (Role)
d065fe5be5 Merge "Merge "Time to #NameAndroidN!" into nyc-dev am: 45caebe035 am: 82aba559fa" into nyc-mr1-dev-plus-aosp 2016-05-27 03:53:34 +00:00
Android Build Merger (Role)
d5b17b2688 Merge "Merge "Delay PACKAGE_RESTARTED until after data cleared." into nyc-dev am: d6ee899397 am: ec298b1567" into nyc-mr1-dev-plus-aosp 2016-05-27 03:53:23 +00:00
Android Build Merger (Role)
a3b87c5d16 Merge "Merge "Careful process validation for unaware providers." into nyc-dev am: 678dba737b am: 2efd671e48" into nyc-mr1-dev-plus-aosp 2016-05-27 03:53:13 +00:00
Android Build Merger (Role)
19e8f51d7e Merge "Defer calling the stack task removed callbacks. am: 6c8217ab30 am: d5fada7253" into nyc-mr1-dev-plus-aosp 2016-05-27 03:53:02 +00:00
Android Build Merger (Role)
268b04e160 Merge changes from topic 'am-e885a22f20324bb0b94c97a807186535' into nyc-mr1-dev-plus-aosp 
* changes:
  Merge "Suppress unlock notifications on non-FBE devices." into nyc-dev am: a39d888651 am: 3f9059fb8d
  Merge "Replace caribou wallpaper without the stars b/28339724" into nyc-dev am: b3d4ad2205 am: 7eb7b41510
 2016-05-27 03:52:50 +00:00
Android Build Merger (Role)
04e20d3805 Merge "Merge "docs: Removing CLI steps in getting started docs" into mnc-io-docs am: 8e08dbe8f8 am: 400aed3556 am: 28bdf2907a am: 26ae893c03" into nyc-mr1-dev-plus-aosp 2016-05-27 03:52:32 +00:00
Android Build Merger (Role)
f4e1c42240 Merge "Merge "Fix an assertion to avoid crash on deletions in Recent root." into nyc-dev am: 7a91029bff am: f846d8518b" into nyc-mr1-dev-plus-aosp 2016-05-27 03:52:12 +00:00
Android Build Merger (Role)
5af6e7d4b5 Merge "Merge "Move VPN restriction check into setup dialog" into nyc-dev am: 32ceb9c801 am: 8d27936438" into nyc-mr1-dev-plus-aosp 2016-05-27 03:52:04 +00:00
Android Build Merger (Role)
3b5aac257b Merge "Merge "Handle trampoline activites in different tasks" into nyc-dev am: 0d35765ca3 am: 03d0a3aeff" into nyc-mr1-dev-plus-aosp 2016-05-27 03:51:57 +00:00
Android Build Merger (Role)
e6c133249b Merge "Merge "Finalize resource IDs for N." into nyc-dev am: 7bbab7e440 am: c37fb8aa6e" into nyc-mr1-dev-plus-aosp 2016-05-27 03:51:49 +00:00
Android Build Merger (Role)
93c1d3aa6e Merge "Merge "Merge "docs: Refinements for testing" into mnc-io-docs am: 9da0730d66 am: feb0b87230" into nyc-dev am: 3dba0fbd53 am: d76cc5d107" into nyc-mr1-dev-plus-aosp 2016-05-27 03:51:41 +00:00
Daniel Sandler
1882e0e8f4 Merge "Time to #NameAndroidN!" into nyc-dev am: 45caebe035 
am: 82aba559fa

* commit '82aba559fabd18dd0c0a7e47e6e1581e22b3b3c1':
  Time to #NameAndroidN!

Change-Id: I3835b4fb0c1b8df86069147f6970302e63f2c544
 2016-05-27 03:51:28 +00:00
Jeff Sharkey
917bc8f303 Merge "Delay PACKAGE_RESTARTED until after data cleared." into nyc-dev am: d6ee899397 
am: ec298b1567

* commit 'ec298b1567c4ca16438ce63252408879056f81c5':
  Delay PACKAGE_RESTARTED until after data cleared.

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

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

Change-Id: I13b89ea99d8319da7cbb001a024814757b1beec7
 2016-05-27 03:50:58 +00:00
Robin Lee
212083bd4f Merge "Move VPN restriction check into setup dialog" into nyc-dev am: 32ceb9c801 
am: 8d27936438

* commit '8d2793643843471a23ebad38acb4ef1f544ecb98':
  Move VPN restriction check into setup dialog

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

* commit '03d0a3aeffe0dddfa1c2cfc26df0a155d7470f4f':
  Handle trampoline activites in different tasks

Change-Id: I5ed39794c95de8fa36388cb9080a5727837c9ee2
 2016-05-27 03:50:40 +00:00
Jeff Sharkey
ea46d115bb Merge "Careful process validation for unaware providers." into nyc-dev am: 678dba737b 
am: 2efd671e48

* commit '2efd671e48d7cd47484cb90f2b0c594c6aecd7ed':
  Careful process validation for unaware providers.

Change-Id: I6fde850370e497f732ede1ec0ee572ca647a8496
 2016-05-27 03:50:33 +00:00
Akshay Thakker
173e2e6b90 Merge "Finalize resource IDs for N." into nyc-dev am: 7bbab7e440 
am: c37fb8aa6e

* commit 'c37fb8aa6e2094336201840ec0a44aa0a5ad6913':
  Finalize resource IDs for N.

Change-Id: Ide5ce846a130624db23ab3df2fa3fc70d4e04eab
 2016-05-27 03:50:27 +00:00
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
Sreevani Sreejith
4b058ae5b7 Merge "Added android:tools specification on navigation and actions page." into mnc-io-docs am: 4ca0c8052c 
am: fe33c063a9

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

Change-Id: Iaef5dee8c0af55ec1698c831f3f1ff93739d4def
 2016-05-27 03:47:33 +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
sreevanis
fe33c063a9 Merge "Added android:tools specification on navigation and actions page." into mnc-io-docs 
am: 4ca0c8052c

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

Change-Id: Ied53973a54a95d2590ed394ebcba0789017687da
 2016-05-27 03:43:12 +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