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
Roshan Pius
568204e3f7 Merge "WifiManager: Add new API's for backup/restore" 2016-06-01 18:34:58 +00:00
Adrian Roos
62eb79e6c8 Merge "AppError: Change "close" to "close app"" into nyc-dev 
am: b4cd4650cf

* commit 'b4cd4650cfd634df75e9e23f9585a756823bd012':
  AppError: Change "close" to "close app"

Change-Id: I8d4a7a2517321551a057776ecf30dc35c6168e4d
 2016-06-01 18:27:55 +00:00
Eric Schmidt
28ed18877b Merge "docs: Fixed \'MessageStyle\' typo" into mnc-io-docs am: 8ef79a9246 
am: 51500a1c5a

* commit '51500a1c5ad6ce1bde1f8966f9835b42d9419a95':
  docs: Fixed 'MessageStyle' typo

Change-Id: I87addb7b46d0985b2cbfc92e6f0f9a7d44ce8963
 2016-06-01 18:25:35 +00:00
Kevin Hufnagle
8b1df8f382 cherry-pick: docs: Added note that <application> at end of manifest. am: d5368b8185 am: f5250c5b37 
am: b04f86acae

* commit 'b04f86acae9f5a0101e997a2dde08342c92b180f':
  cherry-pick: docs: Added note that <application> at end of manifest.

Change-Id: Id72cdfad947a1a8d15cd190de8604f76fbf5a866
 2016-06-01 18:19:48 +00:00
Eric Schmidt
51500a1c5a Merge "docs: Fixed \'MessageStyle\' typo" into mnc-io-docs 
am: 8ef79a9246

* commit '8ef79a9246eba129c22e5d54654ecb85414edf22':
  docs: Fixed 'MessageStyle' typo

Change-Id: Ie9bfc94d89f388763e360841ae129d214156d6d2
 2016-06-01 18:16:17 +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
Adrian Roos
b4cd4650cf Merge "AppError: Change "close" to "close app"" into nyc-dev 2016-06-01 18:14:43 +00:00
Eric Schmidt
556dff9c73 docs: Fixed background optmizations code snippet 
Bug: 28341003
Change-Id: I42b26f52ac6f17b684a8a9673b5acd9d9e647a7f
 2016-06-01 11:13:57 -07:00
Kevin Hufnagle
b04f86acae cherry-pick: docs: Added note that <application> at end of manifest. am: d5368b8185 
am: f5250c5b37

* commit 'f5250c5b372ce3246bdc1e67212dc1fc7ca468ad':
  cherry-pick: docs: Added note that <application> at end of manifest.

Change-Id: I55b4b106e27d642878f8c1050c82594a21ff4574
 2016-06-01 18:10:43 +00:00
Julia Reynolds
88470b5ba2 Merge "Radio buttons belong in a radio group." into nyc-dev 
am: d05a7b5972

* commit 'd05a7b5972cb06f711cc8cfa66efa9f0f6d901a5':
  Radio buttons belong in a radio group.

Change-Id: If12173e67797ba105ea40475e3ad9e3061d592f9
 2016-06-01 18:07:18 +00:00
Eric Schmidt
8ef79a9246 Merge "docs: Fixed 'MessageStyle' typo" into mnc-io-docs 2016-06-01 18:04:56 +00:00
Kevin Hufnagle
f5250c5b37 cherry-pick: docs: Added note that <application> at end of manifest. 
am: d5368b8185

* commit 'd5368b81857a04879ed55be2a67f034cce4e5094':
  cherry-pick: docs: Added note that <application> at end of manifest.

Change-Id: Ie8343e36136e7f3829bf92d7ac26488faf01b489
 2016-06-01 18:02:22 +00:00
TreeHugger Robot
d05a7b5972 Merge "Radio buttons belong in a radio group." into nyc-dev 2016-06-01 18:01:35 +00:00
Dianne Hackborn
970e3f412d Fix issue #29069028 NYC: device boot failure: NPE in AppIdleController 
Make sure the core parts of JobSchedulerService are initialized
before we start creating the controllers.

Change-Id: I497df12f7e6fbd93581291ec691c4b45104d67d0
 2016-06-01 10:55:13 -07:00
Ian Rogers
e3cac08ec6 Merge "Fix call to equals that could never succeed." into nyc-dev 
am: 748620e9f0

* commit '748620e9f03dd66bfed38d91d32b35d79684173b':
  Fix call to equals that could never succeed.

Change-Id: I82af33ea3b93c4017c845b1f791ebee403bffe21
 2016-06-01 17:54:22 +00:00
Dianne Hackborn
c43a7f89f7 Fix issue #29058724: Improve JobScheduler API demo 
We can now include it in the java docs!

Change-Id: I46b4f58e6220347e4f3f12139c9484d1b964c6a2
 2016-06-01 10:48:43 -07:00
TreeHugger Robot
748620e9f0 Merge "Fix call to equals that could never succeed." into nyc-dev 2016-06-01 17:46:03 +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
Jason Monk
023b338111 Merge "QS: Fix single expanded frame from layout" into nyc-dev 
am: 4215ae0100

* commit '4215ae01002f1217587698d24636870ace4a50f5':
  QS: Fix single expanded frame from layout

Change-Id: Id3571cce3d2b4ecd01e5ea8bf1f093e08952a757
 2016-06-01 17:37:49 +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
Evan Rosky
c377103e84 Allow showBouncer to be overridden in subclasses 
Bug: 28759481
Change-Id: I6c33e47f46c46a808d1e945f19a266094fafe56f
(cherry picked from commit 75a8c0cad9a039fbc713e715f79106c524e9de31)
 2016-06-01 17:30:07 +00:00
Jason Monk
947ef9a717 Merge "QS: Followup to scroll fixes" into nyc-dev 
am: 1ceef7c0fa

* commit '1ceef7c0fab15af522f56ade3e08abf559622181':
  QS: Followup to scroll fixes

Change-Id: I0d013329236b9c2ac1a6aa76fba20bcd7e79a4a1
 2016-06-01 17:27:21 +00:00
Jason Monk
4215ae0100 Merge "QS: Fix single expanded frame from layout" into nyc-dev 2016-06-01 17:26:53 +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
Narayan Kamath
0c4f066f0b Merge "PackageManager: Don\'t clear app profiles during system upgrades." into nyc-dev 
am: d579be0cf2

* commit 'd579be0cf234a35273f79676c102b8bd80e071dc':
  Fix deadlock when showing subtitles MediaPlayer

Change-Id: Ib1c57040e723d534df8243ad48479e9b554a74d1
 2016-06-01 17:20:55 +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
Jason Monk
1ceef7c0fa Merge "QS: Followup to scroll fixes" into nyc-dev 2016-06-01 17:20:17 +00:00
Robert Shih
d579be0cf2 Merge "Fix deadlock when showing subtitles MediaPlayer" into nyc-dev 2016-06-01 17:17:00 +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