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
Dianne Hackborn
db8dee7f9e Merge "Work on issue #29042642: Watchdog going off" into nyc-dev am: 5a6cf3ac9a am: c9aaec43a6 
am: 1d185fbad7

* commit '1d185fbad7bbd1139039283b642655b150884108':
  Work on issue #29042642: Watchdog going off

Change-Id: I659acd8ca9d2b1ddd7992d1c079dd968e60befad
 2016-06-02 19:03:55 +00:00
Android Build Merger (Role)
b508d38074 Merge "Merge "Work on issue #29042642: Watchdog going off" into nyc-dev am: 5a6cf3ac9a am: 340f22fcc6" into nyc-mr1-dev-plus-aosp 2016-06-02 18:55:55 +00:00
Suprabh Shukla
1c6c666288 Merge "Changing user switching messages for demo mode" into nyc-mr1-dev am: 5ac8499b25 
am: ef3a63ce74

* commit 'ef3a63ce74bea3f1bd4a033e34070954aa905135':
  Changing user switching messages for demo mode

Change-Id: Ic8c41f7790d40198f20ef088cf37a11a0f153a4c
 2016-06-02 18:55:33 +00:00
Dianne Hackborn
91e1243b72 Merge "Work on issue #29042642: Watchdog going off" into nyc-dev am: 5a6cf3ac9a 
am: 340f22fcc6

* commit '340f22fcc60f0e5d54cd9740b3995170d0c70c62':
  Work on issue #29042642: Watchdog going off

Change-Id: Iea9d7b29a9a7bc0b0d87387088f001d61ada83e7
 2016-06-02 18:55:23 +00:00
Dianne Hackborn
1d185fbad7 Merge "Work on issue #29042642: Watchdog going off" into nyc-dev am: 5a6cf3ac9a 
am: c9aaec43a6

* commit 'c9aaec43a6ff487ff19e5fdb1871efb268b0592b':
  Work on issue #29042642: Watchdog going off

Change-Id: I1ddb808137c527967358e8b12fc93063dd153bfd
 2016-06-02 18:55:13 +00:00
Suprabh Shukla
ef3a63ce74 Merge "Changing user switching messages for demo mode" into nyc-mr1-dev 
am: 5ac8499b25

* commit '5ac8499b25b1533c7e605f8b2cf3861e7cd7970c':
  Changing user switching messages for demo mode

Change-Id: I822aed2c9762f680e3697c18e759168c2a72b1f2
 2016-06-02 18:50:51 +00:00
Dianne Hackborn
340f22fcc6 Merge "Work on issue #29042642: Watchdog going off" into nyc-dev 
am: 5a6cf3ac9a

* commit '5a6cf3ac9a3945c2d1f0e5e28ffda9e52124eb15':
  Work on issue #29042642: Watchdog going off

Change-Id: I2a3b120648aef7401bb6d4c2460f868cdc16c1a0
 2016-06-02 18:50:24 +00:00
Dianne Hackborn
c9aaec43a6 Merge "Work on issue #29042642: Watchdog going off" into nyc-dev 
am: 5a6cf3ac9a

* commit '5a6cf3ac9a3945c2d1f0e5e28ffda9e52124eb15':
  Work on issue #29042642: Watchdog going off

Change-Id: Ic0c08c2ab1c0e7b1cc195928492ab4c0eaef782f
 2016-06-02 18:49:29 +00:00
TreeHugger Robot
078c5e0043 Merge "Merge "Prioritize delete jobs by adding them to a separate thread pool." into nyc-andromeda-dev" 2016-06-02 18:40:34 +00:00
TreeHugger Robot
5ac8499b25 Merge "Changing user switching messages for demo mode" into nyc-mr1-dev 2016-06-02 18:36:09 +00:00
Dianne Hackborn
5a6cf3ac9a Merge "Work on issue #29042642: Watchdog going off" into nyc-dev 2016-06-02 18:31:16 +00:00
Roozbeh Pournader
61b54967e5 Merge "Use bidi heuristics correctly in BoringLayout#isBoring()" 2016-06-02 18:19:42 +00:00
Amith Yamasani
0e29599ffc Merge "Setup user restrictions for demo user" into nyc-mr1-dev am: a28576cb72 
am: 64fc84e9c7

* commit '64fc84e9c78e143e79a0e5b2dddf97f02d1f40d9':
  Setup user restrictions for demo user

Change-Id: I414145f63da75daa63f25879dc2ef8ee167cef10
 2016-06-02 18:07:13 +00:00
Julia Reynolds
c3960f66be Hide alarm condition if there's no alarm. 
Change-Id: Iba8c9eb2bd3033683c25c5cf145fc52f9ac0f0d2
Fixes: 27698976
 2016-06-02 18:06:01 +00:00
Amith Yamasani
64fc84e9c7 Merge "Setup user restrictions for demo user" into nyc-mr1-dev 
am: a28576cb72

* commit 'a28576cb7201b468908346b4807892706870df92':
  Setup user restrictions for demo user

Change-Id: I4121f9745f8d582c0c85240a35b6ed442e8f2850
 2016-06-02 18:00:40 +00:00
Jason Monk
1bec6af01a QS: Only put visible tiles in listening state 
- Make it so the QSPanel doesn't listen until expansion starts
 - Push listening state through the TileLayout
 - Make PagedTileLayout only listen for visible pages
 - Push setListening onto background thread

Change-Id: Id7c008c9447f9a5dac69469fef72bc580f423b0c
Fixes: 28962155
 2016-06-02 13:59:07 -04:00
James Hawkins
899608a83f am/UserController: Log system uptime at two 'boot complete' markers. 
ACTION_LOCKED_BOOT_COMPLETED and ACTION_BOOT_COMPLETED.

Bug: 28070626
Change-Id: I6ff8e840a1c1faf804d6889ac0c3ad96cca8d6f3
(cherry picked from commit 64ce4e7e81)
 2016-06-02 10:52:23 -07:00
Amith Yamasani
a28576cb72 Merge "Setup user restrictions for demo user" into nyc-mr1-dev 2016-06-02 17:51:53 +00:00
Makoto Onuki
7001a61540 ShortcutManager: Implement max # of shortcuts 
- Each activity (launcher icon) can have at most 5 dynamic +
manifest shortcuts.

Bug 28536066

Change-Id: Id34371d51c4a1c5e3df7debe3b71b535eb157b6c
 2016-06-02 10:47:37 -07:00
Garfield Tan
cd9780abff Merge "Prioritize delete jobs by adding them to a separate thread pool." into nyc-andromeda-dev 
Conflicts:
	packages/DocumentsUI/src/com/android/documentsui/services/FileOperationService.java

Change-Id: I1eb4f265891542f8db59349ce158b192f1b14315
 2016-06-02 10:17:59 -07:00
David Brazdil
9d5c0b1c8e Merge "Merge "Do not update packages in encrypted state" into nyc-dev am: c4f1bc4032 am: 7397e80504" into nyc-mr1-dev-plus-aosp 
am: 6094a6053b

* commit '6094a6053be563a77329fa3b411e99ab1244e90e':

Change-Id: I75cbd30e87905abbdab3826a89abb4de9358e89c
 2016-06-02 17:09:09 +00:00
Mady Mellor
0165c546ab Merge "Merge "Parent notifications should always be normal notification color" into nyc-dev am: 09ca7e73c0 am: ece7cd7120" into nyc-mr1-dev-plus-aosp 
am: a6d5dabde2

* commit 'a6d5dabde2485a9285e09389c23c51498db80aaa':

Change-Id: I57ad86e98f00b19e2580f03873a19a83d35e965d
 2016-06-02 17:01:01 +00:00
Zoltan Szatmary-Ban
ba526c47bb Merge "Merge "Only reset global restriction owner on DO->PO for the right user" into nyc-dev am: 2002061f34 am: 6b9371ceef" into nyc-mr1-dev-plus-aosp 
am: 2d74e17bb0

* commit '2d74e17bb0fe0bf9b52332f2664460a8a54549ec':

Change-Id: I6da0fd5a265c4ccec729f1b583e5ebd6e96f164c
 2016-06-02 17:00:57 +00:00
Selim Cinek
8cecff8883 Merge "Merge "Fixed that volume buttons were not working on the pin input" into nyc-dev am: 8e2a2fa98c am: 5df763e177" into nyc-mr1-dev-plus-aosp 
am: 14d77d69a8

* commit '14d77d69a8d63655022d681cdb0f2afbca3058c7':

Change-Id: I185aa92075b5df705ce5651d370ec8ed73a07860
 2016-06-02 17:00:54 +00:00
Selim Cinek
68cd61b072 Merge "Merge "Fixed a crash with notification groups" into nyc-dev am: c152dacc37 am: bf11142c36" into nyc-mr1-dev-plus-aosp 
am: 7141267f68

* commit '7141267f68a7acf57cdf68055445d61b248195f4':

Change-Id: I3e4c72a5ae274102091225fdff0e20f2040c621a
 2016-06-02 17:00:50 +00:00
Chris Wren
e62d8528d7 Merge "Merge "make the notification enqueue rate threshold a setting" into nyc-dev am: 43c3a7e5a7 am: 35f49c5968" into nyc-mr1-dev-plus-aosp 
am: 9a487584dd

* commit '9a487584dd9752fe29da88c49cb26965ef658b5a':

Change-Id: I508b048f2f97b29e8d4df2ca757d5f323ad3aeab
 2016-06-02 17:00:45 +00:00
David Brazdil
ff46d9faf4 Merge "Do not update packages in encrypted state" into nyc-dev am: c4f1bc4032 am: a5e81480b1 
am: 2a7c8c8024

* commit '2a7c8c8024895c3270d4351e6ca4a364d598d52c':
  Do not update packages in encrypted state

Change-Id: Ib0c5e3b003769c150631c7768918552902124456
 2016-06-02 16:57:35 +00:00
Mady Mellor
b06c8adf8d Merge "Parent notifications should always be normal notification color" into nyc-dev am: 09ca7e73c0 am: 0e6207ef40 
am: 9982d86abc

* commit '9982d86abcaa7102511364ddf6bf36a140041709':
  Parent notifications should always be normal notification color

Change-Id: Icdda6486af4cccaacfc48dd30d8b97f0aaffa0a5
 2016-06-02 16:57:30 +00:00
Zoltan Szatmary-Ban
65aa1d33a0 Merge "Only reset global restriction owner on DO->PO for the right user" into nyc-dev am: 2002061f34 am: 462db089d4 
am: 4cdc299716

* commit '4cdc299716bf6f9f5af553994e78e2b3b276783b':
  Only reset global restriction owner on DO->PO for the right user

Change-Id: I51c749ddabeef1b080320baefaab1de4d72860fc
 2016-06-02 16:57:25 +00:00
Selim Cinek
5c0ace99aa Merge "Fixed that volume buttons were not working on the pin input" into nyc-dev am: 8e2a2fa98c am: 01c59fc091 
am: 13eaaea877

* commit '13eaaea8771fc1ed55fde023e622ddc45c59656d':
  Fixed that volume buttons were not working on the pin input

Change-Id: I2361392d72d01413abfd7859e2a70d93cdff662a
 2016-06-02 16:57:20 +00:00
Selim Cinek
e25eadbd67 Merge "Fixed a crash with notification groups" into nyc-dev am: c152dacc37 am: 5432938bf6 
am: f96c5fd462

* commit 'f96c5fd46280754f7122637e2e90055105610030':
  Fixed a crash with notification groups

Change-Id: If68dd896bbc9ae65941782589391d53f3063ea3d
 2016-06-02 16:57:15 +00:00
Android Build Merger (Role)
6094a6053b Merge "Merge "Do not update packages in encrypted state" into nyc-dev am: c4f1bc4032 am: 7397e80504" into nyc-mr1-dev-plus-aosp 2016-06-02 16:55:00 +00:00
David Brazdil
f223039444 Merge "Do not update packages in encrypted state" into nyc-dev am: c4f1bc4032 
am: 7397e80504

* commit '7397e80504bf1af3ef015a1fd108557a8551ac52':
  Do not update packages in encrypted state

Change-Id: I5c5cac85700cce1b9cd690dfdca7ffc1ec5f943e
 2016-06-02 16:54:33 +00:00
Android Build Merger (Role)
a6d5dabde2 Merge "Merge "Parent notifications should always be normal notification color" into nyc-dev am: 09ca7e73c0 am: ece7cd7120" into nyc-mr1-dev-plus-aosp 2016-06-02 16:52:15 +00:00
Android Build Merger (Role)
2d74e17bb0 Merge "Merge "Only reset global restriction owner on DO->PO for the right user" into nyc-dev am: 2002061f34 am: 6b9371ceef" into nyc-mr1-dev-plus-aosp 2016-06-02 16:52:02 +00:00
Android Build Merger (Role)
14d77d69a8 Merge "Merge "Fixed that volume buttons were not working on the pin input" into nyc-dev am: 8e2a2fa98c am: 5df763e177" into nyc-mr1-dev-plus-aosp 2016-06-02 16:51:49 +00:00
Android Build Merger (Role)
7141267f68 Merge "Merge "Fixed a crash with notification groups" into nyc-dev am: c152dacc37 am: bf11142c36" into nyc-mr1-dev-plus-aosp 2016-06-02 16:51:35 +00:00
Android Build Merger (Role)
9a487584dd Merge "Merge "make the notification enqueue rate threshold a setting" into nyc-dev am: 43c3a7e5a7 am: 35f49c5968" into nyc-mr1-dev-plus-aosp 2016-06-02 16:51:22 +00:00
Mady Mellor
86dc81289f Merge "Parent notifications should always be normal notification color" into nyc-dev am: 09ca7e73c0 
am: ece7cd7120

* commit 'ece7cd712072c0415c2982b8a9b608ad24d6bf7c':
  Parent notifications should always be normal notification color

Change-Id: I70892c76677875b44e518ccbca435cea6f2b3fca
 2016-06-02 16:50:44 +00:00
Zoltan Szatmary-Ban
85e4b05461 Merge "Only reset global restriction owner on DO->PO for the right user" into nyc-dev am: 2002061f34 
am: 6b9371ceef

* commit '6b9371ceef5c86c9633ac30aa507b45125aeea7f':
  Only reset global restriction owner on DO->PO for the right user

Change-Id: I9c6c50902c4712da1ff114f75bd0f92c505bc4eb
 2016-06-02 16:50:40 +00:00
Selim Cinek
8bb0a30d9c Merge "Fixed that volume buttons were not working on the pin input" into nyc-dev am: 8e2a2fa98c 
am: 5df763e177

* commit '5df763e1777e0a4e5fcc0bd399029cd03d8a2bc4':
  Fixed that volume buttons were not working on the pin input

Change-Id: I2a53d1203e1037ce957cf051c67d3cd1630ce199
 2016-06-02 16:50:30 +00:00
Selim Cinek
4498fc4761 Merge "Fixed a crash with notification groups" into nyc-dev am: c152dacc37 
am: bf11142c36

* commit 'bf11142c36121e948f9476bc21ae817532a2e74a':
  Fixed a crash with notification groups

Change-Id: I520415e49cccc48c5d26b460aa85ec804e6d9a50
 2016-06-02 16:50:13 +00:00
Chris Wren
ae7b7aa34b Merge "make the notification enqueue rate threshold a setting" into nyc-dev am: 43c3a7e5a7 
am: 35f49c5968

* commit '35f49c5968775ea30fdcb859e94e1c816edfcb0d':

Change-Id: I43dcd53660bce93da819458ae1645ad35c58c3ef
 2016-06-02 16:49:55 +00:00
David Brazdil
2a7c8c8024 Merge "Do not update packages in encrypted state" into nyc-dev am: c4f1bc4032 
am: a5e81480b1

* commit 'a5e81480b16e8cbf5a3c4f015b667893defb1456':
  Do not update packages in encrypted state

Change-Id: I6307cc4b29146dc95f3b5b45f22270fc44d6d2b7
 2016-06-02 16:48:51 +00:00
Mady Mellor
9982d86abc Merge "Parent notifications should always be normal notification color" into nyc-dev am: 09ca7e73c0 
am: 0e6207ef40

* commit '0e6207ef406d1fad389a9831e6c8816b274ad2b5':
  Parent notifications should always be normal notification color

Change-Id: I73542bc4adf5240ec130bac09ef788248f929a9b
 2016-06-02 16:48:36 +00:00
Zoltan Szatmary-Ban
4cdc299716 Merge "Only reset global restriction owner on DO->PO for the right user" into nyc-dev am: 2002061f34 
am: 462db089d4

* commit '462db089d4cd6d290e76ca76c0c159f52dcf0dc1':
  Only reset global restriction owner on DO->PO for the right user

Change-Id: I0463116da229d2da751f52bd022d0c0bc60bef98
 2016-06-02 16:48:31 +00:00
Selim Cinek
13eaaea877 Merge "Fixed that volume buttons were not working on the pin input" into nyc-dev am: 8e2a2fa98c 
am: 01c59fc091

* commit '01c59fc091819d982f821ebc1d347b2821a13c41':
  Fixed that volume buttons were not working on the pin input

Change-Id: I336e32276d219fe0205a934de4533dba1d5cba2d
 2016-06-02 16:48:27 +00:00
Selim Cinek
f96c5fd462 Merge "Fixed a crash with notification groups" into nyc-dev am: c152dacc37 
am: 5432938bf6

* commit '5432938bf6838c934cd4e28e094b9d78eca18777':
  Fixed a crash with notification groups

Change-Id: Id90f5d886d1019871172f0f7262f818e9fb2c36a
 2016-06-02 16:48:23 +00:00
Chris Wren
3a716c735b resolve merge conflicts of 43c3a7e5 to nyc-mr1-dev am: d958f83a01 
am: be2da62d11

* commit 'be2da62d11227c564817906c5df0ceb151ed2436':
  make the notification enqueue rate threshold a setting

Change-Id: I499087166d900cfbd4675e54382117c530e0e3ed
 2016-06-02 16:48:13 +00:00
Chris Wren
be2da62d11 resolve merge conflicts of 43c3a7e5 to nyc-mr1-dev 
am: d958f83a01

* commit 'd958f83a017dde230203d91c8daedf36d40c22a6':
  make the notification enqueue rate threshold a setting

Change-Id: I5172c1a0f0832f3b93d05f0ab7b7b1ab7233d334
 2016-06-02 16:41:30 +00:00