Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
261,098 Commits 3 Branches 0 Tags
69362bc86f72eb9736663a06166804d159c95a47
Commit Graph

261098 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Felipe Leme
69362bc86f Merge "Documented return value of getRestrictBackgroundStatus()." into nyc-dev am: 522787f39a am: d028ec4e29 
am: ad41a42625

* commit 'ad41a42625487bf40c352310676eecb893d09743':

Change-Id: Ie0d5b15bf33d17e67a97ec9e74dd983d9c7bb9ce
 2016-05-16 22:43:23 +00:00
Michael Kwan
c4f497694f Merge "Allow ANR dialogs for Watch eng builds." into nyc-mr1-dev am: 0092f82d4c 
am: c995c6329a

* commit 'c995c6329ad00350dc7f093f3a8082abeffbe608':
  Allow ANR dialogs for Watch eng builds.

Change-Id: Ia58055d661918bdbd89a418502f5c58ee38500b8
 2016-05-16 22:43:05 +00:00
Billy Lamberta
39c2089164 Merge "docs: work minisite" into mnc-io-docs am: 8f740bea13 am: 51ceb1bad1 am: a0a34f6017 am: 3744fda0f3 
am: 47ad72994e

* commit '47ad72994edd396e16374af4468939ee3c2f3c15':
  docs: work minisite

Change-Id: I22eeb66ba64a02df5f12643bca658831137c001e
 2016-05-16 22:35:33 +00:00
Felipe Leme
708cf59ce6 Merge "Documented return value of getRestrictBackgroundStatus()." into nyc-dev am: 522787f39a am: b811d4ede8 
am: 00463970fe

* commit '00463970fe2ac55533a763af8b565d76cb65b496':
  Documented return value of getRestrictBackgroundStatus().

Change-Id: Ia86cbc0d7b0be02f7dad7446127c2c711bb9f771
 2016-05-16 22:35:23 +00:00
Felipe Leme
ad41a42625 Merge "Documented return value of getRestrictBackgroundStatus()." into nyc-dev am: 522787f39a 
am: d028ec4e29

* commit 'd028ec4e29a651b79a5876e3e686dd2f27c3b463':

Change-Id: I36a7ab1160f873a53eb427f4e54e658dd30d336d
 2016-05-16 22:32:02 +00:00
Michael Kwan
c995c6329a Merge "Allow ANR dialogs for Watch eng builds." into nyc-mr1-dev 
am: 0092f82d4c

* commit '0092f82d4c9e439d6930dcd1a7ac42987faf865a':
  Allow ANR dialogs for Watch eng builds.

Change-Id: I3182845d80bacb426363b9245ee49390846d9c15
 2016-05-16 22:31:41 +00:00
Billy Lamberta
47ad72994e Merge "docs: work minisite" into mnc-io-docs am: 8f740bea13 am: 51ceb1bad1 am: a0a34f6017 
am: 3744fda0f3

* commit '3744fda0f365a4337628c729394461e584b068fb':
  docs: work minisite

Change-Id: Iba7643eab1576ec2fb2e36dabac3e932bc37eaab
 2016-05-16 22:28:33 +00:00
Felipe Leme
00463970fe Merge "Documented return value of getRestrictBackgroundStatus()." into nyc-dev am: 522787f39a 
am: b811d4ede8

* commit 'b811d4ede8ca91d1118ccb44a290c0707a984c09':
  Documented return value of getRestrictBackgroundStatus().

Change-Id: Id6197b9ee56fd06505c21c1bb5dce083998aa79a
 2016-05-16 22:28:27 +00:00
Billy Lamberta
3744fda0f3 Merge "docs: work minisite" into mnc-io-docs am: 8f740bea13 am: 51ceb1bad1 
am: a0a34f6017

* commit 'a0a34f6017287d466e90a27f82ff8cf4c91c0663':
  docs: work minisite

Change-Id: I5ad946e6c2786436785f83626e095408b795f826
 2016-05-16 22:23:55 +00:00
Felipe Leme
d028ec4e29 Merge "Documented return value of getRestrictBackgroundStatus()." into nyc-dev 
am: 522787f39a

* commit '522787f39a759cf8af8438641fa8df7470a1b959':
  Documented return value of getRestrictBackgroundStatus().

Change-Id: I1187ffeeb42b61329674ca022735efa08c7e9d98
 2016-05-16 22:23:46 +00:00
Felipe Leme
b811d4ede8 Merge "Documented return value of getRestrictBackgroundStatus()." into nyc-dev 
am: 522787f39a

* commit '522787f39a759cf8af8438641fa8df7470a1b959':
  Documented return value of getRestrictBackgroundStatus().

Change-Id: Ie2e7b14ecc0b574a8776121d3c79c768093ef4f7
 2016-05-16 22:23:44 +00:00
Michael Kwan
0092f82d4c Merge "Allow ANR dialogs for Watch eng builds." into nyc-mr1-dev 2016-05-16 22:21:30 +00:00
Philip P. Moltmann
1aa5a7ae05 Merge "Merge "Adjust PrintRecommendationService for Konica Minolta." into nyc-dev am: 5bfaa9c128 am: 57b364eee7" into nyc-mr1-dev-plus-aosp 
am: 5fa0ec55f8

* commit '5fa0ec55f8c0ec90389efc219fe21791b06e33ef':

Change-Id: Id82872eb20153b8c90b45a39ac7728cefd9a6690
 2016-05-16 22:20:29 +00:00
Fyodor Kupolov
326bacf6a6 Merge "Merge "Delay grantDefaultPermissions until user\'s first start" into nyc-dev am: 6eb923cb64 am: 88fe6bc720" into nyc-mr1-dev-plus-aosp 
am: 11387774a7

* commit '11387774a74ad7625d81ec0b8b15859007917a0f':

Change-Id: I30651f7b27429bb065010267574197699ad72e7e
 2016-05-16 22:20:25 +00:00
Billy Lamberta
a0a34f6017 Merge "docs: work minisite" into mnc-io-docs am: 8f740bea13 
am: 51ceb1bad1

* commit '51ceb1bad18c39a5281fc2cbd6d9c234c2e7f14a':
  docs: work minisite

Change-Id: Ieac1a9a571bfe6ef94663623f5715d1b205dd242
 2016-05-16 22:19:41 +00:00
TreeHugger Robot
522787f39a Merge "Documented return value of getRestrictBackgroundStatus()." into nyc-dev 2016-05-16 22:17:42 +00:00
Philip P. Moltmann
a44056670e Merge "Adjust PrintRecommendationService for Konica Minolta." into nyc-dev am: 5bfaa9c128 am: 6c8767fea9 
am: 46bfa682cd

* commit '46bfa682cd15eccf293b5892246632aa43eccd7f':
  Adjust PrintRecommendationService for Konica Minolta.

Change-Id: I936a92445ec66fe8615dabcb57b9100e4555be57
 2016-05-16 22:17:00 +00:00
Fyodor Kupolov
6c8f741a26 Merge "Delay grantDefaultPermissions until user\'s first start" into nyc-dev am: 6eb923cb64 am: 89033ea614 
am: 6dbcb509df

* commit '6dbcb509dfd1b5ad630db8124b7be2a33c4e5ea9':
  Delay grantDefaultPermissions until user's first start

Change-Id: I248fa24de991c1f65873b68a06e9c66109e05a31
 2016-05-16 22:16:53 +00:00
Philip P. Moltmann
3691f267ce Merge "Clear state when ProgressMessageCtrl. is canceled" into nyc-dev am: 11e215bc45 am: 4012f08b73 
am: a99408caca

* commit 'a99408caca4b6d8815fd95f3e2396062929f7dd8':

Change-Id: I154d00e0e0a14617262abf4800a7486b42266340
 2016-05-16 22:16:41 +00:00
Android Build Merger (Role)
5fa0ec55f8 Merge "Merge "Adjust PrintRecommendationService for Konica Minolta." into nyc-dev am: 5bfaa9c128 am: 57b364eee7" into nyc-mr1-dev-plus-aosp 2016-05-16 22:13:29 +00:00
Android Build Merger (Role)
11387774a7 Merge "Merge "Delay grantDefaultPermissions until user\'s first start" into nyc-dev am: 6eb923cb64 am: 88fe6bc720" into nyc-mr1-dev-plus-aosp 2016-05-16 22:13:19 +00:00
Philip P. Moltmann
930fee6420 Merge "Adjust PrintRecommendationService for Konica Minolta." into nyc-dev am: 5bfaa9c128 
am: 57b364eee7

* commit '57b364eee7dfab340494fa70048ffce8ad81e359':
  Adjust PrintRecommendationService for Konica Minolta.

Change-Id: Id80c0e5458848ea2e98d64a775e0707d6ebadea4
 2016-05-16 22:12:53 +00:00
Fyodor Kupolov
8df2c398d1 Merge "Delay grantDefaultPermissions until user\'s first start" into nyc-dev am: 6eb923cb64 
am: 88fe6bc720

* commit '88fe6bc720eea128286d621f49c52e62330f14ed':
  Delay grantDefaultPermissions until user's first start

Change-Id: I1b89f25e70d4d205296da92bcd76c21bc8adefea
 2016-05-16 22:12:50 +00:00
Philip P. Moltmann
46bfa682cd Merge "Adjust PrintRecommendationService for Konica Minolta." into nyc-dev am: 5bfaa9c128 
am: 6c8767fea9

* commit '6c8767fea9495547a3468f783d0be048d57c7fa3':
  Adjust PrintRecommendationService for Konica Minolta.

Change-Id: I98399def3480297c76e0c0834b3671d3f172cf34
 2016-05-16 22:12:39 +00:00
Billy Lamberta
51ceb1bad1 Merge "docs: work minisite" into mnc-io-docs 
am: 8f740bea13

* commit '8f740bea131ca0234fee9dce273f23c6f21ddf2f':
  docs: work minisite

Change-Id: Id0a4c1be427a131f1766f3452bca1b2f90365981
 2016-05-16 22:12:37 +00:00
Fyodor Kupolov
6dbcb509df Merge "Delay grantDefaultPermissions until user\'s first start" into nyc-dev am: 6eb923cb64 
am: 89033ea614

* commit '89033ea614fe70730172749b6444f78705b66fad':
  Delay grantDefaultPermissions until user's first start

Change-Id: Ic57a83d54fef35ecc3b9f4a41008d07877a1b814
 2016-05-16 22:12:35 +00:00
Philip P. Moltmann
57b364eee7 Merge "Adjust PrintRecommendationService for Konica Minolta." into nyc-dev 
am: 5bfaa9c128

* commit '5bfaa9c1283e05567cd88d35f13ae6872dd687e2':
  Adjust PrintRecommendationService for Konica Minolta.

Change-Id: Ia8c372413c14ad947341546c375123f2c09634ef
 2016-05-16 22:09:38 +00:00
Philip P. Moltmann
a99408caca Merge "Clear state when ProgressMessageCtrl. is canceled" into nyc-dev am: 11e215bc45 
am: 4012f08b73

* commit '4012f08b736538640d363c3ddcdaee35790f33c0':

Change-Id: I4dfbb6298d7959ad941d749db49f24bb2a130cf0
 2016-05-16 22:09:34 +00:00
Philip P. Moltmann
6c8767fea9 Merge "Adjust PrintRecommendationService for Konica Minolta." into nyc-dev 
am: 5bfaa9c128

* commit '5bfaa9c1283e05567cd88d35f13ae6872dd687e2':
  Adjust PrintRecommendationService for Konica Minolta.

Change-Id: Icd5edb72267ac24f700a9b171f97455f6319b74a
 2016-05-16 22:09:32 +00:00
Fyodor Kupolov
88fe6bc720 Merge "Delay grantDefaultPermissions until user\'s first start" into nyc-dev 
am: 6eb923cb64

* commit '6eb923cb64f38dcb23fd3ca15793a13a900b1630':
  Delay grantDefaultPermissions until user's first start

Change-Id: I1924078f6a3e893e07840ba4c80bb59bd1036d7e
 2016-05-16 22:09:31 +00:00
Fyodor Kupolov
89033ea614 Merge "Delay grantDefaultPermissions until user\'s first start" into nyc-dev 
am: 6eb923cb64

* commit '6eb923cb64f38dcb23fd3ca15793a13a900b1630':
  Delay grantDefaultPermissions until user's first start

Change-Id: I16a8505e69e06faf9932c9a173ef8c07ebfddb59
 2016-05-16 22:09:28 +00:00
Billy Lamberta
8f740bea13 Merge "docs: work minisite" into mnc-io-docs 2016-05-16 22:06:01 +00:00
Philip P. Moltmann
3055f3dd52 Merge "Merge "Clear state when ProgressMessageCtrl. is canceled" into nyc-dev am: 11e215bc45 am: 74aac8d9da" into nyc-mr1-dev-plus-aosp 
am: 57fe0d1b08

* commit '57fe0d1b08abdae2f23529841622e0496984194c':
  Clear state when ProgressMessageCtrl. is canceled

Change-Id: I1c9fd5e1f4b01fddec6f8e3a042bb6398d6f0944
 2016-05-16 22:04:56 +00:00
Jorim Jaggi
a64d593cb5 Merge "Don\'t throw away wallpaper bitmap just because we are hidden. am: ed0e1a68a4 am: 11e0c882e0" into nyc-mr1-dev-plus-aosp 
am: 23d3b56bd5

* commit '23d3b56bd518794533e2dbedb423613755e7b4dd':

Change-Id: If01ef5d8e30de8e4d9ea179e65a13a94e9289ada
 2016-05-16 22:04:47 +00:00
Jorim Jaggi
5b4fad5157 Don\'t throw away wallpaper bitmap just because we are hidden. am: ed0e1a68a4 am: 840165f0bf 
am: 0808da6835

* commit '0808da6835130b73d2057fca3a34829cde596e29':
  Don't throw away wallpaper bitmap just because we are hidden.

Change-Id: Ic305fff516794eea7020039a9ba685b6d28d6dbd
 2016-05-16 22:04:30 +00:00
Philip P. Moltmann
5bfaa9c128 Merge "Adjust PrintRecommendationService for Konica Minolta." into nyc-dev 2016-05-16 22:02:47 +00:00
TreeHugger Robot
6eb923cb64 Merge "Delay grantDefaultPermissions until user's first start" into nyc-dev 2016-05-16 22:01:15 +00:00
Philip P. Moltmann
4012f08b73 Merge "Clear state when ProgressMessageCtrl. is canceled" into nyc-dev 
am: 11e215bc45

* commit '11e215bc45de37102977462c9ced878c130ff74a':
  Clear state when ProgressMessageCtrl. is canceled

Change-Id: Ic5e24461b1891d37363195de6bff8d55fba95f3f
 2016-05-16 22:01:03 +00:00
Android Build Merger (Role)
57fe0d1b08 Merge "Merge "Clear state when ProgressMessageCtrl. is canceled" into nyc-dev am: 11e215bc45 am: 74aac8d9da" into nyc-mr1-dev-plus-aosp 2016-05-16 21:59:06 +00:00
Android Build Merger (Role)
23d3b56bd5 Merge "Don\'t throw away wallpaper bitmap just because we are hidden. am: ed0e1a68a4 am: 11e0c882e0" into nyc-mr1-dev-plus-aosp 2016-05-16 21:58:55 +00:00
Philip P. Moltmann
3cabdcc915 Merge "Clear state when ProgressMessageCtrl. is canceled" into nyc-dev am: 11e215bc45 
am: 74aac8d9da

* commit '74aac8d9da4ef1e63215234742c268c458b6ad58':
  Clear state when ProgressMessageCtrl. is canceled

Change-Id: I75d639d3177b83cf7642d3651566d8a6a6a85cbf
 2016-05-16 21:58:33 +00:00
Jorim Jaggi
9dd2547912 Don\'t throw away wallpaper bitmap just because we are hidden. am: ed0e1a68a4 
am: 11e0c882e0

* commit '11e0c882e094f4964814f3c671950161248f004a':
  Don't throw away wallpaper bitmap just because we are hidden.

Change-Id: I618cdf794c5ba5654a2825c60dae873a6d6aab2a
 2016-05-16 21:58:30 +00:00
Jorim Jaggi
0808da6835 Don\'t throw away wallpaper bitmap just because we are hidden. am: ed0e1a68a4 
am: 840165f0bf

* commit '840165f0bfcaaa8dafa3145830488e252a81b675':
  Don't throw away wallpaper bitmap just because we are hidden.

Change-Id: I078065f041ea02f0d1d93dd22201a9d1c7dd9487
 2016-05-16 21:58:05 +00:00
Julia Reynolds
200052d554 Merge "Adjust spacing." into nyc-dev am: 45626c448d am: 197ab4d5dc 
am: a02c735210

* commit 'a02c735210318774667a253b6bee9ea30fc95e70':

Change-Id: I7070e47dc6dbd0e880c9719fa12b616f694f7410
 2016-05-16 21:57:28 +00:00
Andrew Solovay
c851896057 docs: Minor permissions phrasing tweak am: 9acd851ee6 am: 072b6fb839 am: 8804495bff am: 3228255e77 am: a1a224fa83 
am: 0e2755e7c1

* commit '0e2755e7c1bddcdb9ff192b1d426818a639753f7':
  Adjust spacing.

Change-Id: I27a9c0e60f3576dd1b608003557c92b5be4e9b43
 2016-05-16 21:57:22 +00:00
Android Build Merger (Role)
a02c735210 Merge "Merge "Adjust spacing." into nyc-dev am: 45626c448d am: 4293b96872" into nyc-mr1-dev-plus-aosp 2016-05-16 21:52:12 +00:00
Philip P. Moltmann
74aac8d9da Merge "Clear state when ProgressMessageCtrl. is canceled" into nyc-dev 
am: 11e215bc45

* commit '11e215bc45de37102977462c9ced878c130ff74a':
  Clear state when ProgressMessageCtrl. is canceled

Change-Id: If2f257fbc8aac0c04c4e71e5215870ef613a730b
 2016-05-16 21:51:48 +00:00
Andrew Solovay
10ac4aabc6 docs: Minor permissions phrasing tweak am: 9acd851ee6 am: 072b6fb839 am: 8804495bff am: 3228255e77 am: a1a224fa83 
am: ba0d5b0f57

* commit 'ba0d5b0f57fc15d3d55abeed379d6bf5213f34de':

Change-Id: I375aee1186743fd9b3bee4a14f27e7af8179d68b
 2016-05-16 21:51:45 +00:00
Jorim Jaggi
11e0c882e0 Don\'t throw away wallpaper bitmap just because we are hidden. 
am: ed0e1a68a4

* commit 'ed0e1a68a437979e399724ca17f422add80bd0e4':
  Don't throw away wallpaper bitmap just because we are hidden.

Change-Id: Ifcc6aeb2a916781d8a8a7523f8a00926b45b0d2e
 2016-05-16 21:51:44 +00:00
Andrew Solovay
12fff1c00f docs: Minor permissions phrasing tweak am: 9acd851ee6 am: 072b6fb839 am: 8804495bff am: 3228255e77 am: 05710bf9e3 
am: a671603628

* commit 'a671603628b4003462d9bb9ff67b1e88590c47e1':
  docs: Minor permissions phrasing tweak

Change-Id: If299098d74088a95026e88fc42d6cab3215f96f3
 2016-05-16 21:51:40 +00:00