Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
254,385 Commits 3 Branches 0 Tags
47e1e14589cb62de65332ee467e845efc3e43d55
Commit Graph

254385 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Sid Soundararajan
165410d445 Add an extra to HOME intent to indicate it comes form recents. 
This allows the launcher to know how to handle HOME press properly
when a video is playing in the background. Without this, the Launcher
dismisses it's UI.

Launcher CL: https://googleplex-android-review.git.corp.google.com/#/c/1043435/

BUG: 28173127
Change-Id: Iab0c5013fc41f79a6fd45f49904edd0d0f9c17ff
 2016-05-16 14:59:53 -07: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
Tim Murray
666212b75c Make persistent apps become top correctly. 
Sometimes, a persistent app should be the top app (recents). Make sure
such an app can use the top-app cpuset.

bug 28317812
bug 28794389

Change-Id: I756cec3fbab8cc552a6d90c007aa2e07f6b78dbc
 2016-05-16 14:53:29 -07: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
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
Julia Reynolds
a2e735897b Merge "Adjust spacing." into nyc-dev am: 45626c448d 
am: 4293b96872

* commit '4293b9687299fda1a1ae4ba6ffc3cda7c817a1a5':
  Adjust spacing.

Change-Id: Id1dd33f9bbe861078038f798b86af512072addc7
 2016-05-16 21:51:37 +00:00
Jorim Jaggi
840165f0bf 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: Id1af47665ea63354c6f6e6f8f01761b7c917d2ad
 2016-05-16 21:51:23 +00:00
Julia Reynolds
0e2755e7c1 Merge "Adjust spacing." into nyc-dev am: 45626c448d 
am: 197ab4d5dc

* commit '197ab4d5dc0a074ebd1543b08b56843a9f16c6ed':
  Adjust spacing.

Change-Id: I9d4b1ad0282a462e701039f6525bdbb6bef1f1ed
 2016-05-16 21:50:05 +00:00
Philip P. Moltmann
11e215bc45 Merge "Clear state when ProgressMessageCtrl. is canceled" into nyc-dev 2016-05-16 21:43:13 +00:00
Julia Reynolds
197ab4d5dc Merge "Adjust spacing." into nyc-dev 
am: 45626c448d

* commit '45626c448d63b7a3c0e86d7b03043271f7fa68af':
  Adjust spacing.

Change-Id: I9368d77b3d6d630d53a8a9beb6f5d20665268930
 2016-05-16 21:41:52 +00:00
Julia Reynolds
4293b96872 Merge "Adjust spacing." into nyc-dev 
am: 45626c448d

* commit '45626c448d63b7a3c0e86d7b03043271f7fa68af':
  Adjust spacing.

Change-Id: Id73f60aa292581048add8c40b0a580b57ea653bd
 2016-05-16 21:41:46 +00:00
Andrew Solovay
ba0d5b0f57 docs: Minor permissions phrasing tweak am: 9acd851ee6 am: 072b6fb839 am: 8804495bff am: 3228255e77 
am: a1a224fa83

* commit 'a1a224fa83e70c2fdc3e602d5ef084e013af0164':

Change-Id: I399dc584f93489dd6395441e860e4d89ff50172f
 2016-05-16 21:39:18 +00:00
Anthony Hugh
d216ac3da3 Change Priority Only mode defaults on watches 
Changes Priority Only mode defaults on watches to the following:
Allow starred contacts to go through only. Repeated calls on.
Calls, messages, reminders, events off

BUG: 28640779
Change-Id: I89d57de58a8c3bb62432f97e96b60c653745d303
 2016-05-16 14:38:59 -07:00
Jorim Jaggi
ed0e1a68a4 Don't throw away wallpaper bitmap just because we are hidden. 
TRIM_MEMORY_UI_HIDDEN > TRIM_MEMORY_RUNNING constants, so we only
need to throw away the wallpaper if we are actually running low on
memory.

Bug: 28769940
Change-Id: I8aa27d081bbcc2eff553e9420b2b9b0920f3781f
 2016-05-16 21:37:59 +00:00
Andrew Solovay
a671603628 docs: Minor permissions phrasing tweak am: 9acd851ee6 am: 072b6fb839 am: 8804495bff am: 3228255e77 
am: 05710bf9e3

* commit '05710bf9e30ebdbb9c82006afc5cb275073ac45a':
  docs: Minor permissions phrasing tweak

Change-Id: I01dfc20cc305662ba205eeb99ca2887ab643c25c
 2016-05-16 21:35:00 +00:00
Julia Reynolds
45626c448d Merge "Adjust spacing." into nyc-dev 2016-05-16 21:34:15 +00:00
Android Build Merger (Role)
430b82217a Merge "Merge "docs: Removed note that GET_ACCOUNTS was deprecated am: cc80393d94 am: af9dc9292b am: be2b224d80" into nyc-dev am: a586b078b3 am: 232d2f8fc7" into nyc-mr1-dev-plus-aosp 2016-05-16 21:33:06 +00:00
Android Build Merger (Role)
a97ff704e5 Merge "Merge "Fix inconsistencies in DragEvent.getX/getY behavior and JavaDoc." into nyc-dev am: a423ec52ac am: 4695fae868" into nyc-mr1-dev-plus-aosp 2016-05-16 21:32:44 +00:00
Andrew Solovay
f21e0ba082 Merge "docs: Removed note that GET_ACCOUNTS was deprecated am: cc80393d94 am: af9dc9292b am: be2b224d80" into nyc-dev am: a586b078b3 
am: 232d2f8fc7

* commit '232d2f8fc788198487853c4bd2b3ae324ad8cbe5':
  docs: Removed note that GET_ACCOUNTS was deprecated

Change-Id: I599ea6a44b791826eff797241d7ef9d71d79c988
 2016-05-16 21:32:19 +00:00
Vladislav Kaznacheev
686b021f81 Merge "Fix inconsistencies in DragEvent.getX/getY behavior and JavaDoc." into nyc-dev am: a423ec52ac 
am: 4695fae868

* commit '4695fae86896d5f452d95196120bb4948f11803a':
  Fix inconsistencies in DragEvent.getX/getY behavior and JavaDoc.

Change-Id: If53ca21962eab18e3a0b97d1b9402a1294f472dc
 2016-05-16 21:32:13 +00:00
Andrew Solovay
3195a6a098 Merge "docs: Removed note that GET_ACCOUNTS was deprecated am: cc80393d94 am: af9dc9292b am: be2b224d80" into nyc-dev am: a586b078b3 
am: d25e86bef0

* commit 'd25e86bef075a0537ec7c3355a466ce1c28bbefe':
  docs: Removed note that GET_ACCOUNTS was deprecated

Change-Id: Ia8e2256af3502888c547cdd82bbdfc222d73ab8f
 2016-05-16 21:31:14 +00:00
Vladislav Kaznacheev
a19f5b640c Merge "Fix inconsistencies in DragEvent.getX/getY behavior and JavaDoc." into nyc-dev am: a423ec52ac 
am: 943c9f10d2

* commit '943c9f10d284acf5a5f927517fc7c283c473382e':
  Fix inconsistencies in DragEvent.getX/getY behavior and JavaDoc.

Change-Id: I6a35f83dcc11704dfbc983bd9004685ecc63b9b5
 2016-05-16 21:31:10 +00:00
Andrew Solovay
05710bf9e3 docs: Minor permissions phrasing tweak am: 9acd851ee6 am: 072b6fb839 am: 8804495bff 
am: 3228255e77

* commit '3228255e772e026da7d00cb914e76e454830328d':
  docs: Minor permissions phrasing tweak

Change-Id: I5cfb4898f976a34fb4b88c19238c13853f8231c8
 2016-05-16 21:31:06 +00:00
Sanket Padawe
0eed46b0d0 Merge "Update doc of ACTION_SET_RADIO_CAPABILITY_DONE intent." into nyc-dev am: 8c60dbe3ca 
am: fc848e9c2b

* commit 'fc848e9c2bcab9878cdae3f6458529f42768e873':

Change-Id: Ieb18c5f3aa978e477528463d5c28ffcfb9756045
 2016-05-16 21:31:05 +00:00
Andrew Solovay
a1a224fa83 docs: Minor permissions phrasing tweak am: 9acd851ee6 am: 072b6fb839 am: 8804495bff 
am: 3228255e77

* commit '3228255e772e026da7d00cb914e76e454830328d':
  docs: Minor permissions phrasing tweak

Change-Id: Iaa59ba0131a79a17d408d0a42ef15a190b0d972c
 2016-05-16 21:30:54 +00:00
Andrew Solovay
232d2f8fc7 Merge "docs: Removed note that GET_ACCOUNTS was deprecated am: cc80393d94 am: af9dc9292b am: be2b224d80" into nyc-dev 
am: a586b078b3

* commit 'a586b078b356b4a2da6b2d9b1135c6a41b85703e':
  docs: Removed note that GET_ACCOUNTS was deprecated

Change-Id: I1e90ff314935950c751b1f42f637806f01054e8f
 2016-05-16 21:26:12 +00:00
Vladislav Kaznacheev
4695fae868 Merge "Fix inconsistencies in DragEvent.getX/getY behavior and JavaDoc." into nyc-dev 
am: a423ec52ac

* commit 'a423ec52ac427e5bdbd12aac21ef75eff7d96140':
  Fix inconsistencies in DragEvent.getX/getY behavior and JavaDoc.

Change-Id: I5d87956bf0fe48acf66d577d8531e2669ec5b001
 2016-05-16 21:26:09 +00:00
Andrew Solovay
d25e86bef0 Merge "docs: Removed note that GET_ACCOUNTS was deprecated am: cc80393d94 am: af9dc9292b am: be2b224d80" into nyc-dev 
am: a586b078b3

* commit 'a586b078b356b4a2da6b2d9b1135c6a41b85703e':
  docs: Removed note that GET_ACCOUNTS was deprecated

Change-Id: I4cb72280c61fcdcb23f39f1875b575d05ea2cc90
 2016-05-16 21:26:09 +00:00
Andrew Solovay
3228255e77 docs: Minor permissions phrasing tweak am: 9acd851ee6 am: 072b6fb839 
am: 8804495bff

* commit '8804495bffbbffa0abe8cd148ba1ea3c58e20be0':
  docs: Minor permissions phrasing tweak

Change-Id: I348ecb4cbe9301eccd78c6e2f87b1eb016627d5d
 2016-05-16 21:26:07 +00:00
Sanket Padawe
8259fd31c7 Merge "Update doc of ACTION_SET_RADIO_CAPABILITY_DONE intent." into nyc-dev am: 8c60dbe3ca 
am: 2bd42d8224

* commit '2bd42d82243c90b051a449cdcb7fb3766b5d3a83':
  Update doc of ACTION_SET_RADIO_CAPABILITY_DONE intent.

Change-Id: I23c27cd49972b658d00fb0f5dd9d466094ce4179
 2016-05-16 21:26:04 +00:00
Vladislav Kaznacheev
943c9f10d2 Merge "Fix inconsistencies in DragEvent.getX/getY behavior and JavaDoc." into nyc-dev 
am: a423ec52ac

* commit 'a423ec52ac427e5bdbd12aac21ef75eff7d96140':
  Fix inconsistencies in DragEvent.getX/getY behavior and JavaDoc.

Change-Id: I8b704c0cf3b4df430b0f5a322e1cee008e67d113
 2016-05-16 21:26:04 +00:00
Android Build Merger (Role)
a586b078b3 Merge "docs: Removed note that GET_ACCOUNTS was deprecated am: cc80393d94 am: af9dc9292b am: be2b224d80" into nyc-dev 2016-05-16 21:23:22 +00:00
Sanket Padawe
fc848e9c2b Merge "Update doc of ACTION_SET_RADIO_CAPABILITY_DONE intent." into nyc-dev 
am: 8c60dbe3ca

* commit '8c60dbe3caae6bdfc202f17455526cb16cd46439':
  Update doc of ACTION_SET_RADIO_CAPABILITY_DONE intent.

Change-Id: I65ce85fd9134594c9db88252b268eaba93cdcb4d
 2016-05-16 21:23:04 +00:00
Andrew Solovay
d65f0c9eed docs: Removed note that GET_ACCOUNTS was deprecated am: cc80393d94 am: af9dc9292b 
am: be2b224d80

* commit 'be2b224d80554906aa03c57f6096fa51afb48fdf':
  docs: Removed note that GET_ACCOUNTS was deprecated

Change-Id: Ic6ffde061f37bd74e45a3f60de8a5bb6aa241c58
 2016-05-16 21:22:55 +00:00
Sanket Padawe
2bd42d8224 Merge "Update doc of ACTION_SET_RADIO_CAPABILITY_DONE intent." into nyc-dev 
am: 8c60dbe3ca

* commit '8c60dbe3caae6bdfc202f17455526cb16cd46439':
  Update doc of ACTION_SET_RADIO_CAPABILITY_DONE intent.

Change-Id: I737738186f863b6fdbb034c878a964f54d7b0369
 2016-05-16 21:22:19 +00:00