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
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
Jim Miller
97c4dec2ff Merge "Don\'t always announce accessibility events when resetting password" into nyc-dev am: 2d1c424a0e 
am: d79eaa220c

* commit 'd79eaa220c84130f96db8249e9860e57edd605c3':

Change-Id: Icf65f8d865b12634060c821ae64e098eb77e406f
 2016-05-17 22:32:25 +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
Android Build Merger (Role)
4713c4079d Merge "Merge "Fixed a screen flickering on tablets" into nyc-dev am: ce80acd73a am: be80263275" into nyc-mr1-dev-plus-aosp 2016-05-17 22:28:00 +00:00
Android Build Merger (Role)
03e3a1f308 Merge "Merge "Fixed a bug with auto cancelling" into nyc-dev am: a35d9b3ee0 am: d61b5b655e" into nyc-mr1-dev-plus-aosp 2016-05-17 22:27:50 +00:00
Android Build Merger (Role)
87e89a47ec Merge "Merge "Don\'t always announce accessibility events when resetting password" into nyc-dev am: 2d1c424a0e am: 9e507bd737" into nyc-mr1-dev-plus-aosp 2016-05-17 22:27:42 +00:00
Selim Cinek
a0a542d0f0 Merge "Fixed a screen flickering on tablets" into nyc-dev am: ce80acd73a 
am: be80263275

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

Change-Id: Iae540c51ef8e28d493dfe4fca4dcb5c86947918a
 2016-05-17 22:27:08 +00:00
Selim Cinek
c0dca174e7 Merge "Fixed a bug with auto cancelling" into nyc-dev am: a35d9b3ee0 
am: d61b5b655e

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

Change-Id: I4c934cf6b2da6fe4859f390bf05da8642accbe02
 2016-05-17 22:26:51 +00:00
Jim Miller
40d4d6094c Merge "Don\'t always announce accessibility events when resetting password" into nyc-dev am: 2d1c424a0e 
am: 9e507bd737

* commit '9e507bd73702ae56da0439be0b9f27e05b06f558':
  Don't always announce accessibility events when resetting password

Change-Id: Id1fa56d69af2d7394fa2083511f68c6621d19a54
 2016-05-17 22:26:45 +00:00
Dianne Hackborn
b847bcb65e Merge "Work on issue #28689719: Runtime restart" into nyc-dev am: 77ad5f1657 
am: ebfbc39537

* commit 'ebfbc3953719b00a51450c3002cb2d26cfa0289d':

Change-Id: Ib46312139e77f68dd8eeef5d90586d79ecaead17
 2016-05-17 22:25:49 +00:00
Paul Crowley
cc70155f3b Two phases to set the password for disk encryption 
Revert "Revert "Two phases to set the password for disk encryption""

This reverts commit a1eb750e75.

Bug: 28154455
Bug: 28694324
Change-Id: I8106bfba28da401b9fd38349c6a9fa9a24f54712
 2016-05-17 15:22:29 -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
be80263275 Merge "Fixed a screen flickering on tablets" into nyc-dev 
am: ce80acd73a

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

Change-Id: I5829b4044df7605bbeecb0545d2d600384132181
 2016-05-17 22:21:37 +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
Selim Cinek
d61b5b655e Merge "Fixed a bug with auto cancelling" into nyc-dev 
am: a35d9b3ee0

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

Change-Id: I46be6f420c4ad89ffc7cd88f621aed173ba130d1
 2016-05-17 22:21:32 +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
Dianne Hackborn
a648b098f8 Merge "Work on issue #28689719: Runtime restart" into nyc-dev am: 77ad5f1657 
am: ab82de14b1

* commit 'ab82de14b1c6bdf44fa2cac96c37620f0f2319f0':
  Work on issue #28689719: Runtime restart

Change-Id: I9dc025c78a1d58cf46b73141063dda0c9632d502
 2016-05-17 22:21:24 +00:00
Jim Miller
9e507bd737 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: I8ff47b7b9c340fbf5ef4dfde619a80264ca9c170
 2016-05-17 22:21:24 +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
Dianne Hackborn
ab82de14b1 Merge "Work on issue #28689719: Runtime restart" into nyc-dev 
am: 77ad5f1657

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

Change-Id: Ic44a4f56be67e3a50932d6bfbb58cdca6536e501
 2016-05-17 22:06:57 +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
sreevanis
a214c7c269 Notification changes for Wear 2.0 and Release notes. 
Bug:28472076
Change-Id: Ie5231c6a4d3c243249c8345b94186af67ff21a06
 2016-05-17 15:04:37 -07: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
Garfield, Tan
a9d424ab97 Open root list when hovering on the edge in drawer layout. 
Bug: 28345294

Change-Id: Ia569003e21aea0641ccc1d2a5e042bdc93f32bb3
(cherry picked from commit 49eda9885e81a32f8a3d7cc7b9f9f15766b2621e)
 2016-05-17 21:55:13 +00:00
Wei Jia
4ccc419c1e Merge "Merge "android_media_MediaSync: Do not pass NULL to AString ctor." into nyc-dev am: c4e8471ba4 am: 613dc4cc1d" into nyc-mr1-dev-plus-aosp 
am: 349ca27ce3

* commit '349ca27ce30390f41bb9147b438fe43e0367df6c':

Change-Id: Ia9fb2f48a531dbcee40fdd2ed555a2af107a2028
 2016-05-17 21:49:25 +00:00
Wei Jia
84ed074c19 Merge "android_media_MediaSync: Do not pass NULL to AString ctor." into nyc-dev am: c4e8471ba4 am: 8a53cc9e26 
am: 68e8d86b02

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

Change-Id: I363fa893c1e895168c9a41293a167f606f289c2e
 2016-05-17 21:49:21 +00:00
Android Build Merger (Role)
349ca27ce3 Merge "Merge "android_media_MediaSync: Do not pass NULL to AString ctor." into nyc-dev am: c4e8471ba4 am: 613dc4cc1d" into nyc-mr1-dev-plus-aosp 2016-05-17 21:45:58 +00:00
Adrian Roos
9770cdc5b1 Merge "Merge "Fix broken MessagingStyle" into nyc-dev am: 8802fd0700 am: d91b14d862" into nyc-mr1-dev-plus-aosp 
am: 4fa6801180

* commit '4fa68011809a199c1ac4e340640d65abea420253':

Change-Id: Ied804aced773e03bc02bdbac87fc84716d87c66d
 2016-05-17 21:45:28 +00:00
Wei Jia
68e1651912 Merge "android_media_MediaSync: Do not pass NULL to AString ctor." into nyc-dev am: c4e8471ba4 
am: 613dc4cc1d

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

Change-Id: I412def216bdb52238b560b0e575ff629473cc0a6
 2016-05-17 21:45:27 +00:00
Wei Jia
68e8d86b02 Merge "android_media_MediaSync: Do not pass NULL to AString ctor." into nyc-dev am: c4e8471ba4 
am: 8a53cc9e26

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

Change-Id: If80c04ca3a7a61ee774e0353eb69d1017a31ffdc
 2016-05-17 21:44:49 +00:00
Wei Jia
8a53cc9e26 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: I1b883f4fe46ebb150841f5a75517a8340597edba
 2016-05-17 21:39:05 +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
Adrian Roos
e5b0923a02 Merge "Fix broken MessagingStyle" into nyc-dev am: 8802fd0700 am: efc9c88d00 
am: 31459c3202

* commit '31459c32028951101a338abf95e48d9143444914':
  Fix broken MessagingStyle

Change-Id: Ibc65e18c45862df50fc651028ce2347af886d7c6
 2016-05-17 21:38:31 +00:00
Philip P. Moltmann
f1413249db Handle printers selected by SelectPrinter activity 
- Declare a printers availability when changing the removed state.
- Set printJob.printerId to current printer when returning from
  SelectPrinter

Change-Id: Ie4680be04fa614a4088f2f32a527e80928c957cc
Fixes: 27643305
 2016-05-17 14:26:13 -07:00
sreevanis
fb4206387d API Overview page for Wear 2.0 preview. 
Bug:28714669
Change-Id: Icc76b610f329d6c24046bf654e2895f123af9cc6
 2016-05-17 14:25:19 -07:00
Android Build Merger (Role)
4fa6801180 Merge "Merge "Fix broken MessagingStyle" into nyc-dev am: 8802fd0700 am: d91b14d862" into nyc-mr1-dev-plus-aosp 2016-05-17 21:23:36 +00:00
Adrian Roos
5db7ac8086 Merge "Fix broken MessagingStyle" into nyc-dev am: 8802fd0700 
am: d91b14d862

* commit 'd91b14d862568233d3467bb91497a3aabeecab29':
  Fix broken MessagingStyle

Change-Id: If3cd26444ee728e5b71eb3921aaa983591d0d8a1
 2016-05-17 21:23:10 +00:00
Jiaquan He
074ae46960 Change some members in QSTileBaseView and QSTileView. 
Bug: 28531806

Change-Id: I06ff3189f413ce7877d66e4f583cae05869e1ae5
 2016-05-17 21:23:05 +00:00
Adrian Roos
31459c3202 Merge "Fix broken MessagingStyle" into nyc-dev am: 8802fd0700 
am: efc9c88d00

* commit 'efc9c88d002263f748716405f7e63becc3685211':
  Fix broken MessagingStyle

Change-Id: Ia328b569b347cb29ddc82b5fcce3efee6bfc7734
 2016-05-17 21:22:39 +00:00
Hangyu Kuang
1e7d1aa6a6 Hide HdrCapabilities constructor. 
Bug:25684127
Change-Id: I1a30ab3c162d8891c8aea1447757c85942033a0d
 2016-05-17 14:21:01 -07:00
Wei Jia
c4e8471ba4 Merge "android_media_MediaSync: Do not pass NULL to AString ctor." into nyc-dev 2016-05-17 21:17:37 +00:00
Adrian Roos
efc9c88d00 Merge "Fix broken MessagingStyle" into nyc-dev 
am: 8802fd0700

* commit '8802fd0700e40ce97555f70db1b02daeece3bfb5':
  Fix broken MessagingStyle

Change-Id: I31975da4749c801a8fbf3bfffb666daa69c9c2af
 2016-05-17 21:17:33 +00:00