Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
248,687 Commits 3 Branches 0 Tags
794d9a2e9133b9ab902f4ccd6a0cd1109a933ea8
Commit Graph

248687 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew Solovay
794d9a2e91 Merge "resolve merge conflicts of bd96855 to nyc-dev" into nyc-dev 
am: f3f5d79210

* commit 'f3f5d7921073f7976bbab75394554e5fe7992aaa':
  docs: Creating new support library revision history page

Change-Id: I1895793d67d6910c7750439f7d4486fc52fc32c1
 2016-05-18 01:03:55 +00:00
Andrew Solovay
f3f5d79210 Merge "resolve merge conflicts of bd96855 to nyc-dev" into nyc-dev 2016-05-18 01:00:13 +00:00
Chris Craik
77f706980e Merge "Document that SurfaceView is synchronous in N" into nyc-dev 
am: 0cfbb7643e

* commit '0cfbb7643ef81cc8d1fd72bfe7c651d0e5e04949':
  Document that SurfaceView is synchronous in N

Change-Id: I508585ec749b0a5d4e241757d655349b09b31566
 2016-05-18 00:55:17 +00:00
Andrii Kulian
06a325c3e3 Merge "DO NOT MERGE Hide decor caption APIs" into nyc-dev 
am: 47aa3f61ac

* commit '47aa3f61ac26195e11d7244c84bce3a1ea2dfb3f':
  DO NOT MERGE Hide decor caption APIs

Change-Id: I7654435d1b251d1349125beb0b5d4a35c81855b1
 2016-05-18 00:55:12 +00:00
TreeHugger Robot
0cfbb7643e Merge "Document that SurfaceView is synchronous in N" into nyc-dev 2016-05-18 00:51:57 +00:00
Andrii Kulian
47aa3f61ac Merge "DO NOT MERGE Hide decor caption APIs" into nyc-dev 2016-05-18 00:51:17 +00:00
Joe Onorato
6b10cec210 Merge changes If51568c3,Idd434c19 into nyc-dev 
am: 45165c9373

* commit '45165c9373f1bf2dbe0c3f11b271daa24414ea35':
  Demote the log in ProcessState.ensureNotDead from a wtf to a warning.
  @hide SystemHealthManager.from

Change-Id: Id56c7ee80254eac26132956ef62b83c405a0e2f8
 2016-05-18 00:49:54 +00:00
TreeHugger Robot
45165c9373 Merge changes If51568c3,Idd434c19 into nyc-dev 
* changes:
  Demote the log in ProcessState.ensureNotDead from a wtf to a warning.
  @hide SystemHealthManager.from
 2016-05-18 00:46:47 +00:00
Hangyu Kuang
993f685045 Merge "Hide HdrCapabilities constructor." into nyc-dev 
am: c189934573

* commit 'c1899345730ab3c4504cb314b371b4fa43ca0702':
  Hide HdrCapabilities constructor.

Change-Id: Id3e15f6d3f26634dc632caa8f775071516436cd5
 2016-05-18 00:46:35 +00:00
Hangyu Kuang
c189934573 Merge "Hide HdrCapabilities constructor." into nyc-dev 2016-05-18 00:42:55 +00:00
Jorim Jaggi
e48384c867 Merge "Fix threading problems with drawables" into nyc-dev 
am: 1e09e9826b

* commit '1e09e9826b24c6d877920b027954e0e861a336a0':
  Fix threading problems with drawables

Change-Id: I06a58a1a9454f9e9c384b9999ef6077cc45cf46f
 2016-05-18 00:28:48 +00:00
TreeHugger Robot
1e09e9826b Merge "Fix threading problems with drawables" into nyc-dev 2016-05-18 00:24:04 +00:00
Adrian Roos
3a0f4f4b64 Merge "Adjust Notification APIs per API council" into nyc-dev 
am: 718ba309cf

* commit '718ba309cfc9bbc3bbf785bbe5dfc1049ce02d20':
  Adjust Notification APIs per API council

Change-Id: I282bb2b6e4718f7b1afb3eb418a8d37deaa457b0
 2016-05-18 00:13:14 +00:00
Andrew Solovay
61dbd85a9e resolve merge conflicts of bd96855 to nyc-dev 
Change-Id: Ic07598d00f7ea59f800c260ba448a16df4e397dd
 2016-05-17 17:06:52 -07:00
TreeHugger Robot
718ba309cf Merge "Adjust Notification APIs per API council" into nyc-dev 2016-05-18 00:06:30 +00:00
Dianne Hackborn
fe061f1bcb Merge "Fix issue #28817455: [NYC] [BullHead] Fatal Exception in CNEService" into nyc-dev 
am: 0fda52b92e

* commit '0fda52b92ecc8e9eb508c6ce249705be53761277':
  Fix issue #28817455: [NYC] [BullHead] Fatal Exception in CNEService

Change-Id: I86591bd5a343ef4028ee6451b307f2a96a400486
 2016-05-18 00:02:13 +00:00
Dianne Hackborn
0fda52b92e Merge "Fix issue #28817455: [NYC] [BullHead] Fatal Exception in CNEService" into nyc-dev 2016-05-17 23:54:14 +00:00
Wale Ogunwale
db314a0aa1 Merge "Make Recents activity invisible when it is behind a translucent activity" into nyc-dev 
am: cbc73decf1

* commit 'cbc73decf11344ebcf7a35c31585b66e021e38a1':
  Make Recents activity invisible when it is behind a translucent activity

Change-Id: I345069ffbb0f9694b29e4077240d6527d2ec096c
 2016-05-17 23:52:18 +00:00
TreeHugger Robot
cbc73decf1 Merge "Make Recents activity invisible when it is behind a translucent activity" into nyc-dev 2016-05-17 23:46:57 +00:00
Chong Zhang
d73883c7f8 Merge "Fix wallpaper cropped too soon when unminimizing dock" into nyc-dev 
am: daa0d214dd

* commit 'daa0d214dd07caa8dc99abe635211ed94200bc2e':
  Fix wallpaper cropped too soon when unminimizing dock

Change-Id: I851227f5df0bf3cb0a1519fca1991db8927222c5
 2016-05-17 23:39:47 +00:00
Ruben Brunk
2b699f0fe0 Merge "Dismiss immersive mode overlay while in VR mode." into nyc-dev 
am: 8ecf66fc83

* commit '8ecf66fc83e76165bea3cd408c687bd0b79c0552':
  Dismiss immersive mode overlay while in VR mode.

Change-Id: I15038cfb9e2ccfc119353d33699f2001eed4e180
 2016-05-17 23:39:41 +00:00
Chong Zhang
daa0d214dd Merge "Fix wallpaper cropped too soon when unminimizing dock" into nyc-dev 2016-05-17 23:35:27 +00:00
Chong Zhang
e5bbbea494 Merge "Use focused app\'s stack for IME adjustment" into nyc-dev 
am: 65ee55457d

* commit '65ee55457dc39c3e30c677d9126565799b50a8dc':
  Use focused app's stack for IME adjustment

Change-Id: I4852a25d7a0bc356b659d8acb4407d820cd14502
 2016-05-17 23:34:20 +00:00
Ruben Brunk
8ecf66fc83 Merge "Dismiss immersive mode overlay while in VR mode." into nyc-dev 2016-05-17 23:29:53 +00:00
Chong Zhang
65ee55457d Merge "Use focused app's stack for IME adjustment" into nyc-dev 2016-05-17 23:27:19 +00:00
Roshan Pius
73be9053b9 Merge "Adjust wifi idle times to fit in system time period" into nyc-dev 
am: e1f6975ebc

* commit 'e1f6975ebc1499ddcb493666f884ef0d8e042255':
  Adjust wifi idle times to fit in system time period

Change-Id: Id3dd41bab8096452d3f806304e2127cf1cc970c2
 2016-05-17 23:20:04 +00:00
Chris Craik
6ee192f4e9 Document that SurfaceView is synchronous in N 
bug:28821062

Change-Id: I1c17949d93de3d1f89c504fc061f7d20dd451a4d
 2016-05-17 16:17:25 -07:00
Andrew Solovay
bd96855929 resolve merge conflicts of 33d83db to mnc-ub-dev 
Change-Id: I8c148af6eec071ac076882a53c5ba2929cf0c9d2
 2016-05-17 16:09:03 -07:00
TreeHugger Robot
e1f6975ebc Merge "Adjust wifi idle times to fit in system time period" into nyc-dev 2016-05-17 23:07:58 +00:00
Jorim Jaggi
ca0cf0f529 Fix threading problems with drawables 
We can't use the same instance on both the main and the background
thread, as this will lead to problems.

Change-Id: Ieec525f028df2d0596667126d8f5004773461517
Fixes: 28745682
 2016-05-17 23:05:38 +00:00
smain@google.com
8c9ffe1fe3 invert the quotes for links in the JSON to avoid breakage from devsite\'s URL parser (or whatever). bug: 28801246 am: 28445c4d7d am: bf4296e500 am: 7c919ef804 
am: 8ab4d2c0b4

* commit '8ab4d2c0b4fc2c7f67f6100c2264fba49fc6de8a':
  invert the quotes for links in the JSON to avoid breakage from devsite's URL parser (or whatever). bug: 28801246

Change-Id: Ic3233b734ee1e18353d761ff918de3ffbef590ec
 2016-05-17 23:02:25 +00:00
smain@google.com
8ab4d2c0b4 invert the quotes for links in the JSON to avoid breakage from devsite\'s URL parser (or whatever). bug: 28801246 am: 28445c4d7d am: bf4296e500 
am: 7c919ef804

* commit '7c919ef8042c1864fb4ea39a663e6ff684bd0156':
  invert the quotes for links in the JSON to avoid breakage from devsite's URL parser (or whatever). bug: 28801246

Change-Id: I64afc374bb3261b0f5f69a8f4a7677369dfec353
 2016-05-17 22:40:42 +00:00
Adrian Roos
96b7e20ba6 Adjust Notification APIs per API council 
Also fixes a slight bug where a CharSequence extra
was retrieved as a string.

Change-Id: I8a40ab1934b8a20355c3cd4afd66a4a7b91fb517
Fixes: 28775580
Fixes: 28775582
 2016-05-17 15:35:33 -07:00
smain@google.com
7c919ef804 invert the quotes for links in the JSON to avoid breakage from devsite\'s URL parser (or whatever). bug: 28801246 am: 28445c4d7d 
am: bf4296e500

* commit 'bf4296e500af87a83ff64642cb15d25e81df01c5':
  invert the quotes for links in the JSON to avoid breakage from devsite's URL parser (or whatever). bug: 28801246

Change-Id: I9504b2b124e00e0d0bbeea56b7611c57f6bfd9fc
 2016-05-17 22:32:26 +00:00
Joe Onorato
1cc1d13d6e Demote the log in ProcessState.ensureNotDead from a wtf to a warning. 
It's raising alarm bells but there isn't much we can do without a lot
of rewriting inside the ActivityManager.  The only consequence is stats
that are off by a little bit.

Bug: 28581070
Change-Id: If51568c3a708a907ceef6452e7d45599a57454f7
 2016-05-17 15:31:38 -07:00
Joe Onorato
22cfef381d @hide SystemHealthManager.from 
Bug: 28820055
Change-Id: Idd434c196428178e2c66facea36a7e010246611c
 2016-05-17 15:29:51 -07:00
Selim Cinek
ba0639ad01 Merge "Fixed a screen flickering on tablets" into nyc-dev 
am: ce80acd73a

* commit 'ce80acd73a5a34d15531d8377fa5b16d0ec5deb7':
  Fixed a screen flickering on tablets

Change-Id: I933d1b9d4b93f4f621bce2f55b85d8462f5e994b
 2016-05-17 22:21:40 +00:00
Selim Cinek
a6a27fb71f Merge "Fixed a bug with auto cancelling" into nyc-dev 
am: a35d9b3ee0

* commit 'a35d9b3ee055d591249a30c58285fe2be5a45c43':
  Fixed a bug with auto cancelling

Change-Id: Id6e2850c96274a406ea52095516bfbe39dd2d2c8
 2016-05-17 22:21:36 +00:00
Jim Miller
d79eaa220c Merge "Don\'t always announce accessibility events when resetting password" into nyc-dev 
am: 2d1c424a0e

* commit '2d1c424a0ee8e210c1cd3f71b78d5a11e94f4ff3':
  Don't always announce accessibility events when resetting password

Change-Id: I7e1e2b8982708490b9ff467f6dfc129b11269259
 2016-05-17 22:21:30 +00:00
Andrew Solovay
33d83dbd6c Merge "docs: Creating new support library revision history page" into mnc-mr-docs 
am: e780c62462

* commit 'e780c6246202ea42c8de159e5b473a897faeb6bb':
  docs: Creating new support library revision history page

Change-Id: I249c9a9c889cdf273fd995860f3b0129aa9e12ce
 2016-05-17 22:21:23 +00:00
smain@google.com
bf4296e500 invert the quotes for links in the JSON to avoid breakage from devsite\'s URL parser (or whatever). bug: 28801246 
am: 28445c4d7d

* commit '28445c4d7d46a14e8cc2654c4912019327cbe471':
  invert the quotes for links in the JSON to avoid breakage from devsite's URL parser (or whatever). bug: 28801246

Change-Id: I243768d45ff5ac5eb11140ac8f8d770335be3d70
 2016-05-17 22:21:19 +00:00
Ruben Brunk
c30c8fd29c Dismiss immersive mode overlay while in VR mode. 
Bug: 28052143
Change-Id: I750753c72cb8d41bf91c108e8fc645750fbf9c45
 2016-05-17 15:15:28 -07:00
TreeHugger Robot
e780c62462 Merge "docs: Creating new support library revision history page" into mnc-mr-docs 2016-05-17 22:13:08 +00:00
Chong Zhang
b8da4a7fa8 Use focused app's stack for IME adjustment 
Don't use mInputMethodTarget as it could be set to some system alert
window that has both FLAG_NOT_FOCUSABLE and FLAG_ALT_FOCUSABLE_IM,
and it's not actually taking inputs.

bug: 28328085
Change-Id: I38263f64fec13a5e10357499ebc97671389ba69a
 2016-05-17 15:08:44 -07:00
Dianne Hackborn
ebfbc39537 Merge "Work on issue #28689719: Runtime restart" into nyc-dev 
am: 77ad5f1657

* commit '77ad5f1657a8bef6b28f69f9bd8a2d1978c88a57':
  Work on issue #28689719: Runtime restart

Change-Id: I29e0ef82bed0df030939b198d5a238405dc7486a
 2016-05-17 22:07:01 +00:00
Selim Cinek
ce80acd73a Merge "Fixed a screen flickering on tablets" into nyc-dev 2016-05-17 22:05:54 +00:00
Selim Cinek
a35d9b3ee0 Merge "Fixed a bug with auto cancelling" into nyc-dev 2016-05-17 22:05:39 +00:00
Jim Miller
2d1c424a0e Merge "Don't always announce accessibility events when resetting password" into nyc-dev 2016-05-17 22:00:37 +00:00
Dianne Hackborn
77ad5f1657 Merge "Work on issue #28689719: Runtime restart" into nyc-dev 2016-05-17 21:58:21 +00:00
Wei Jia
613dc4cc1d Merge "android_media_MediaSync: Do not pass NULL to AString ctor." into nyc-dev 
am: c4e8471ba4

* commit 'c4e8471ba4afb0d2cae0d9e29f5c14b4bbfe4524':
  android_media_MediaSync: Do not pass NULL to AString ctor.

Change-Id: Id138df3cfe1ee989d4abf52ae283b63419e7047a
 2016-05-17 21:39:01 +00:00