Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
257,571 Commits 3 Branches 0 Tags
45fea4d6e9732d12fcc63243c678c405d7efae40
Commit Graph

257571 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vasco Brito
45fea4d6e9 Merge "Revert "Merge "Add 900 for Russia - Short code used by Sberbank.""" am: 56bd06fc3e am: ce82f1c16a 
am: be718d8836

* commit 'be718d8836e85b8bff0de83e4fefbd92675c0855':
  Revert "Merge "Add 900 for Russia - Short code used by Sberbank.""

Change-Id: Ie1371d5dd1458038a2a2a93bba7c2e45f1d671ea
 2016-06-01 19:14:29 +00:00
Robert Greenwalt
be718d8836 Merge "Revert "Merge "Add 900 for Russia - Short code used by Sberbank.""" am: 56bd06fc3e 
am: ce82f1c16a

* commit 'ce82f1c16a4c10e003a11020fcb3c232010c40c6':
  Revert "Merge "Add 900 for Russia - Short code used by Sberbank.""

Change-Id: Id0b350da8369340a4ac538358481577b22bc73d3
 2016-06-01 19:07:45 +00:00
Vasco Brito
ce82f1c16a Merge "Revert "Merge "Add 900 for Russia - Short code used by Sberbank.""" 
am: 56bd06fc3e

* commit '56bd06fc3e29290ba90b792a7f7353864cbf772a':
  Revert "Merge "Add 900 for Russia - Short code used by Sberbank.""

Change-Id: I0450be79c583cd2fc27156460b32b23830fc3c68
 2016-06-01 18:51:28 +00:00
Robert Greenwalt
56bd06fc3e Merge "Revert "Merge "Add 900 for Russia - Short code used by Sberbank.""" 2016-06-01 18:15:16 +00:00
Android Build Merger (Role)
06aae68d82 Merge "Merge "PackageManager: Don\'t clear app profiles during system upgrades." into nyc-dev am: 93193135b1 am: 93a01103af" into nyc-mr1-dev-plus-aosp 2016-06-01 17:39:07 +00:00
Android Build Merger (Role)
85ddd0be68 Merge "Merge "QS: Only put visible tiles in listening state" into nyc-dev am: 8768f68713 am: ae42c4a118" into nyc-mr1-dev-plus-aosp 2016-06-01 17:38:53 +00:00
Android Build Merger (Role)
3f41ed9f3f Merge "Merge "QS: Protect against crash with no icon" into nyc-dev am: 7b945d8d30 am: 2891acd139" into nyc-mr1-dev-plus-aosp 2016-06-01 17:38:41 +00:00
Android Build Merger (Role)
f1b2350330 Merge "Merge "MessagingStyle: Generate EXTRA_TITLE and EXTRA_TEXT" into nyc-dev am: ff39d3ec2f am: adc3f1ec2b" into nyc-mr1-dev-plus-aosp 2016-06-01 17:38:25 +00:00
Brian Carlstrom
777e0e22ae Merge "PackageManager: Don\'t clear app profiles during system upgrades." into nyc-dev am: 93193135b1 
am: 93a01103af

* commit '93a01103afae6bfada5a7b8decd96c2e3af0448b':
  PackageManager: Don't clear app profiles during system upgrades.

Change-Id: I6306780a19f729114a5134281a088f106159d7db
 2016-06-01 17:37:42 +00:00
Jason Monk
7d615745f8 Merge "QS: Only put visible tiles in listening state" into nyc-dev am: 8768f68713 
am: ae42c4a118

* commit 'ae42c4a1181a304039e425dbc6c0c2d12a31b0b9':
  QS: Only put visible tiles in listening state

Change-Id: I62885fc401c4676226e4ff9d3a41d15664c8b75b
 2016-06-01 17:37:37 +00:00
Jason Monk
4f25498455 Merge "QS: Protect against crash with no icon" into nyc-dev am: 7b945d8d30 
am: 2891acd139

* commit '2891acd139d0db993df975a97f953a194d5c0db2':
  QS: Protect against crash with no icon

Change-Id: I10bb822408d59d228d5b28bdc77f8581941cbe11
 2016-06-01 17:37:31 +00:00
Adrian Roos
f50765def7 Merge "MessagingStyle: Generate EXTRA_TITLE and EXTRA_TEXT" into nyc-dev am: ff39d3ec2f 
am: adc3f1ec2b

* commit 'adc3f1ec2b8b85d1b3ced34e424e1b091f937b03':
  MessagingStyle: Generate EXTRA_TITLE and EXTRA_TEXT

Change-Id: I68a1cc476055a7fe28cb9f5157dfc0362de7c9bd
 2016-06-01 17:37:25 +00:00
Brian Carlstrom
eaa8b0fcfb Merge "PackageManager: Don\'t clear app profiles during system upgrades." into nyc-dev am: 93193135b1 
am: 41846b0612

* commit '41846b061226af72eaffbdea4dc44fa2bbd087b1':
  PackageManager: Don't clear app profiles during system upgrades.

Change-Id: I524bf5934835d10d42dec63bacd52cd1bacda96d
 2016-06-01 17:34:51 +00:00
Jason Monk
7bd7318b8f Merge "QS: Only put visible tiles in listening state" into nyc-dev am: 8768f68713 
am: e696c8465b

* commit 'e696c8465b599fdbc560ec18a7497f90d0a3efbe':
  QS: Only put visible tiles in listening state

Change-Id: If91dcf13524c6d63cf99946639163c45bae15739
 2016-06-01 17:34:33 +00:00
Jason Monk
71a7976e35 Merge "QS: Protect against crash with no icon" into nyc-dev am: 7b945d8d30 
am: a58c1a52ac

* commit 'a58c1a52ac44a53175475f78cea074583ed5e177':
  QS: Protect against crash with no icon

Change-Id: I20c0c15d3e7358f056198280d8d9c2b0d9ca4115
 2016-06-01 17:34:18 +00:00
Adrian Roos
86a0e3befe Merge "MessagingStyle: Generate EXTRA_TITLE and EXTRA_TEXT" into nyc-dev am: ff39d3ec2f 
am: 72bc1299f2

* commit '72bc1299f2020c4acd51defed6da430d61edc5fa':
  MessagingStyle: Generate EXTRA_TITLE and EXTRA_TEXT

Change-Id: Ifcba6fe03700c39b9777c3c08ffa1c4bf4873dd7
 2016-06-01 17:34:05 +00:00
Narayan Kamath
93a01103af Merge "PackageManager: Don\'t clear app profiles during system upgrades." into nyc-dev 
am: 93193135b1

* commit '93193135b184a2f1c7518d8beeff7c51b2880606':
  PackageManager: Don't clear app profiles during system upgrades.

Change-Id: Ic765c13a476c0924d2ede278b379db86d634fa1f
 2016-06-01 17:26:22 +00:00
Jason Monk
ae42c4a118 Merge "QS: Only put visible tiles in listening state" into nyc-dev 
am: 8768f68713

* commit '8768f687138510b90dd997e41720ad7d88637b49':
  QS: Only put visible tiles in listening state

Change-Id: I361a2ad640505ec2b1f10adb31e41aea0daced4e
 2016-06-01 17:26:14 +00:00
Jason Monk
2891acd139 Merge "QS: Protect against crash with no icon" into nyc-dev 
am: 7b945d8d30

* commit '7b945d8d30a6e3978b50d5952539279a71148eca':
  QS: Protect against crash with no icon

Change-Id: I6bf6ddc7a8331c2e324c5ae7c065c4eb9eb9fead
 2016-06-01 17:26:06 +00:00
Adrian Roos
adc3f1ec2b Merge "MessagingStyle: Generate EXTRA_TITLE and EXTRA_TEXT" into nyc-dev 
am: ff39d3ec2f

* commit 'ff39d3ec2fa773a50bbd069a40570767c80fd404':
  MessagingStyle: Generate EXTRA_TITLE and EXTRA_TEXT

Change-Id: I4f725f15c12a3e5f49a521564ad2be54b75b2dd2
 2016-06-01 17:25:52 +00:00
Android Build Merger (Role)
30ce7f2c28 Merge "Merge "Adds alpha to dimmed backgrounds" into nyc-dev am: 0d7dbb0f28 am: c123c0b4d0" into nyc-mr1-dev-plus-aosp 2016-06-01 17:22:33 +00:00
Mady Mellor
740ff49796 Merge "Adds alpha to dimmed backgrounds" into nyc-dev am: 0d7dbb0f28 
am: c123c0b4d0

* commit 'c123c0b4d02e948757e825e4f8249391afd45e3f':

Change-Id: I6c21ac599c286db2f84a399a61613d2d7d6ca16a
 2016-06-01 17:21:58 +00:00
Benjamin Franz
8f79bc6c77 Merge "Add an intent extra to force master clear" into nyc-mr1-dev 
am: 3c826b160c

* commit '3c826b160c724d38f49bb479aa13ab8cf685e2d2':
  Add an intent extra to force master clear

Change-Id: I5789ac49b040ba6b1330e9680c1a595f24e82af9
 2016-06-01 17:20:43 +00:00
Android Build Merger (Role)
4da8883193 Merge "Merge "Adds alpha to dimmed backgrounds" into nyc-dev am: 0d7dbb0f28 am: 8c475d5b0a" into nyc-mr1-dev-plus-aosp 2016-06-01 17:15:00 +00:00
Narayan Kamath
41846b0612 Merge "PackageManager: Don\'t clear app profiles during system upgrades." into nyc-dev 
am: 93193135b1

* commit '93193135b184a2f1c7518d8beeff7c51b2880606':
  PackageManager: Don't clear app profiles during system upgrades.

Change-Id: I1eddbe894b3f4a2583973a98f3dc0d8adf8af16c
 2016-06-01 17:14:59 +00:00
Jason Monk
e696c8465b Merge "QS: Only put visible tiles in listening state" into nyc-dev 
am: 8768f68713

* commit '8768f687138510b90dd997e41720ad7d88637b49':
  QS: Only put visible tiles in listening state

Change-Id: I437e2841841d6b54ba5c747052a885109b7e8bc4
 2016-06-01 17:14:54 +00:00
Jason Monk
a58c1a52ac Merge "QS: Protect against crash with no icon" into nyc-dev 
am: 7b945d8d30

* commit '7b945d8d30a6e3978b50d5952539279a71148eca':
  QS: Protect against crash with no icon

Change-Id: I6e4fedcad9d788fcb2b8c803e905671bfff3f561
 2016-06-01 17:14:50 +00:00
Adrian Roos
72bc1299f2 Merge "MessagingStyle: Generate EXTRA_TITLE and EXTRA_TEXT" into nyc-dev 
am: ff39d3ec2f

* commit 'ff39d3ec2fa773a50bbd069a40570767c80fd404':
  MessagingStyle: Generate EXTRA_TITLE and EXTRA_TEXT

Change-Id: I96b1992f69d94f24a63784c1c2d954b91ab9570d
 2016-06-01 17:14:47 +00:00
Mady Mellor
f6cff1a0ea Merge "Adds alpha to dimmed backgrounds" into nyc-dev am: 0d7dbb0f28 
am: 8c475d5b0a

* commit '8c475d5b0a18705aa8e76a1efa01b6860fc8ceae':
  Adds alpha to dimmed backgrounds

Change-Id: Id58651cfd6bf2be8e47c7d59bce96779cb1539f5
 2016-06-01 17:14:27 +00:00
Android Build Merger (Role)
4ef21b0c1d Merge "Merge "trim and strip html tags for load safe label name" into nyc-dev am: c16bc88fc9 am: 30680c6506" into nyc-mr1-dev-plus-aosp 2016-06-01 17:14:20 +00:00
Benjamin Franz
3c826b160c Merge "Add an intent extra to force master clear" into nyc-mr1-dev 2016-06-01 17:13:15 +00:00
Chen Xu
7c02044ee8 Merge "trim and strip html tags for load safe label name" into nyc-dev am: c16bc88fc9 
am: 30680c6506

* commit '30680c65061777a6eaa4a19e195567765bdb6b6d':
  trim and strip html tags for load safe label name

Change-Id: I13347f68eba49563974e5067eb9997b20ac0b5cd
 2016-06-01 17:12:16 +00:00
Chen Xu
d97994962d Merge "trim and strip html tags for load safe label name" into nyc-dev am: c16bc88fc9 
am: 36befb2dbc

* commit '36befb2dbce9b05ce1cf26ee9aef5c268d6c7266':
  trim and strip html tags for load safe label name

Change-Id: I630902aad16a71485506628625bb3b9c09b992f6
 2016-06-01 17:06:41 +00:00
Mady Mellor
8c475d5b0a Merge "Adds alpha to dimmed backgrounds" into nyc-dev 
am: 0d7dbb0f28

* commit '0d7dbb0f282afb43ec2a6a81789379749b2ab054':
  Adds alpha to dimmed backgrounds

Change-Id: I1ae5d761387b9eb9b9eb42c1eea65275b63eed64
 2016-06-01 17:06:26 +00:00
Mady Mellor
c123c0b4d0 Merge "Adds alpha to dimmed backgrounds" into nyc-dev 
am: 0d7dbb0f28

* commit '0d7dbb0f282afb43ec2a6a81789379749b2ab054':
  Adds alpha to dimmed backgrounds

Change-Id: Iebe58b6c0b8a1b030626e5bb581dfd2c92d17a7b
 2016-06-01 17:06:24 +00:00
Brian Carlstrom
93193135b1 Merge "PackageManager: Don't clear app profiles during system upgrades." into nyc-dev 2016-06-01 17:06:20 +00:00
Jason Monk
8768f68713 Merge "QS: Only put visible tiles in listening state" into nyc-dev 2016-06-01 17:04:26 +00:00
Jason Monk
7b945d8d30 Merge "QS: Protect against crash with no icon" into nyc-dev 2016-06-01 17:04:21 +00:00
TreeHugger Robot
ff39d3ec2f Merge "MessagingStyle: Generate EXTRA_TITLE and EXTRA_TEXT" into nyc-dev 2016-06-01 17:02:00 +00:00
fionaxu
30680c6506 Merge "trim and strip html tags for load safe label name" into nyc-dev 
am: c16bc88fc9

* commit 'c16bc88fc99a6446c77d0b075f242c042bb31ded':
  trim and strip html tags for load safe label name

Change-Id: I34cebbce65db27304e6d3dcc2c6e0cbc0f005b03
 2016-06-01 16:56:44 +00:00
fionaxu
36befb2dbc Merge "trim and strip html tags for load safe label name" into nyc-dev 
am: c16bc88fc9

* commit 'c16bc88fc99a6446c77d0b075f242c042bb31ded':
  trim and strip html tags for load safe label name

Change-Id: Ic79f077813fcf2124fe1cbf031cb4e0770a02a51
 2016-06-01 16:55:51 +00:00
Mady Mellor
0d7dbb0f28 Merge "Adds alpha to dimmed backgrounds" into nyc-dev 2016-06-01 16:53:50 +00:00
Chen Xu
c16bc88fc9 Merge "trim and strip html tags for load safe label name" into nyc-dev 2016-06-01 16:47:19 +00:00
Android Build Merger (Role)
d032e5fad5 Merge "Merge "Work on issue #28942589: Tune job scheduler" into nyc-dev am: 438693dd6c am: 0e443c1320" into nyc-mr1-dev-plus-aosp 2016-06-01 16:46:19 +00:00
Dianne Hackborn
689db54fde Merge "Work on issue #28942589: Tune job scheduler" into nyc-dev am: 438693dd6c 
am: 0e443c1320

* commit '0e443c132092fc028227297aa71ed4a35729c71c':
  Work on issue #28942589: Tune job scheduler

Change-Id: I14cf39b73d09b3dccc6b3a5ed08d38f8a7d536ba
 2016-06-01 16:45:46 +00:00
Dianne Hackborn
e174476b70 Merge "Work on issue #28942589: Tune job scheduler" into nyc-dev am: 438693dd6c 
am: 576430f36a

* commit '576430f36ac04843fed5697ecae1716489c164bb':
  Work on issue #28942589: Tune job scheduler

Change-Id: I101010ff1d7d88c2ccac14d095df7722569cf549
 2016-06-01 16:45:40 +00:00
Dianne Hackborn
576430f36a Merge "Work on issue #28942589: Tune job scheduler" into nyc-dev 
am: 438693dd6c

* commit '438693dd6cc4e3fe2ffb336d551c0d69e9546102':
  Work on issue #28942589: Tune job scheduler

Change-Id: I9e4ddcc64d84a8d943128d8bd8ebf158743c5549
 2016-06-01 16:38:18 +00:00
Dianne Hackborn
0e443c1320 Merge "Work on issue #28942589: Tune job scheduler" into nyc-dev 
am: 438693dd6c

* commit '438693dd6cc4e3fe2ffb336d551c0d69e9546102':
  Work on issue #28942589: Tune job scheduler

Change-Id: I8264ce4204762358ccbf893e7846434eed258a22
 2016-06-01 16:38:12 +00:00
Dianne Hackborn
438693dd6c Merge "Work on issue #28942589: Tune job scheduler" into nyc-dev 2016-06-01 16:27:06 +00:00
Narayan Kamath
34a6258b2a PackageManager: Don't clear app profiles during system upgrades. 
They don't need to be cleared and will remain valid as long as
the application itself hasn't changed.

bug: 28998083
bug: 29067239
Change-Id: I2e4a4ee1b168da81073b8e70b12918db592fe691
 2016-06-01 16:12:23 +00:00