Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
246,497 Commits 3 Branches 0 Tags
ffe7746437e8f06cc7dd2571c3354973791c8a8a
Commit Graph

246497 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dirk Dougherty
0a957d5aa2 Merge "Update default image for n preview docs. Update tools resources." into mnc-mr-docs 2016-05-16 22:27:48 +00:00
TreeHugger Robot
8e30eb3a7f Merge "Fix transition delay tracking when starting activity from recents" into nyc-dev 2016-05-16 22:27:39 +00:00
Dianne Hackborn
0cb1cc74b8 Merge "Fix issue #28794831: meminfo considers cached processes to be services" into nyc-dev 2016-05-16 22:26:13 +00:00
Scott Main
a0acf474e9 Merge "Avoid weird line wrapping by removing columns and forcing line breaks between the links" into mnc-mr-docs 2016-05-16 22:25:51 +00:00
Billy Lamberta
031929076e Merge "docs: work minisite" into mnc-io-docs am: 8f740bea13 am: 51ceb1bad1 
am: a0a34f6017

* commit 'a0a34f6017287d466e90a27f82ff8cf4c91c0663':
  docs: work minisite

Change-Id: I2152083326c271ebd9adc5eea7a072db9b7aa080
 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
smain@google.com
d078d20ac6 Avoid weird line wrapping by removing columns and forcing line breaks between the links 
Change-Id: I797b46d75643ce2491d47c95599164022ce451a7
 2016-05-16 15:22:17 -07:00
Baligh Uddin
a3b6b364c6 Import translations. DO NOT MERGE 
Change-Id: Ic96958132725f1af9e842dbab5158628e51dea73
Auto-generated-cl: translation import
 2016-05-16 15:22:14 -07:00
Michael Kwan
0092f82d4c Merge "Allow ANR dialogs for Watch eng builds." into nyc-mr1-dev 2016-05-16 22:21:30 +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
Baligh Uddin
0c931d6f80 Import translations. DO NOT MERGE 
Change-Id: If114c25440347c1fb96059eb7531dac999d88fcc
Auto-generated-cl: translation import
 2016-05-16 15:19:18 -07:00
Amith Yamasani
bf12565276 Allow Shell to change component enabled state 
But make sure that we don't allow Shell or other apps
to disable an active profile or device owner.

Also limit exactly what states Shell can switch apps
between, similar to Settings UI.

This is required for some CTS tests

Bug: 27924655
Change-Id: I958f0d1de7f0bc1f5a0cbf853d57dfdeb2f9ad59
 2016-05-16 15:17:50 -07:00
TreeHugger Robot
522787f39a Merge "Documented return value of getRestrictBackgroundStatus()." into nyc-dev 2016-05-16 22:17:42 +00:00
Baligh Uddin
474bbe75c6 Import translations. DO NOT MERGE 
Change-Id: Ie2093912a314d30d88818d983c34d77925ec7051
Auto-generated-cl: translation import
 2016-05-16 15:13:35 -07: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
Baligh Uddin
0e00b517e2 Import translations. DO NOT MERGE 
Change-Id: Iee59140458a863dd1d258b9281c7463c6af31b1e
Auto-generated-cl: translation import
 2016-05-16 15:10:33 -07: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
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
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
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
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
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
Julia Reynolds
45626c448d Merge "Adjust spacing." into nyc-dev 2016-05-16 21:34:15 +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
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
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
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
TreeHugger Robot
a423ec52ac Merge "Fix inconsistencies in DragEvent.getX/getY behavior and JavaDoc." into nyc-dev 2016-05-16 21:21:58 +00:00
Jorim Jaggi
1e630c0829 Fix transition delay tracking when starting activity from recents 
- Move logic to determine app switch etc. into ActivityMetricsLogger.
- Make sure the notify the tracker in startActivityFromRecentsInner

Bug: 27295491
Change-Id: Ic68058c88917e3f37183dded2f13cb35055323ee
 2016-05-16 21:18:04 +00:00
Andrew Solovay
8804495bff docs: Minor permissions phrasing tweak am: 9acd851ee6 
am: 072b6fb839

* commit '072b6fb83928120de268a1e59ebabb7f2a5c724a':
  docs: Minor permissions phrasing tweak

Change-Id: I90d66b9c745bb6f313a074c9d4b4c94a8319dbc3
 2016-05-16 21:16:06 +00:00
Andrew Solovay
072b6fb839 docs: Minor permissions phrasing tweak 
am: 9acd851ee6

* commit '9acd851ee6071fa82a725a69d75c59bf4068a83a':
  docs: Minor permissions phrasing tweak

Change-Id: I823cc460ffbf71fce9013967046076f937af3168
 2016-05-16 21:13:13 +00:00
TreeHugger Robot
8c60dbe3ca Merge "Update doc of ACTION_SET_RADIO_CAPABILITY_DONE intent." into nyc-dev 2016-05-16 21:13:05 +00:00
Andrew Solovay
be2b224d80 docs: Removed note that GET_ACCOUNTS was deprecated am: cc80393d94 
am: af9dc9292b

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

Change-Id: Id5866a8ce27407924508703292a223a4f0399cb3
 2016-05-16 21:11:04 +00:00
Andrew Solovay
af9dc9292b docs: Removed note that GET_ACCOUNTS was deprecated 
am: cc80393d94

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

Change-Id: Icc2579926a473f72236837fb94a68fbf16494478
 2016-05-16 21:08:05 +00:00
Andrew Solovay
9acd851ee6 docs: Minor permissions phrasing tweak 
Meant to make this change in a preceding CL but accidentally
submitted before uploading the last patch set.

bug: 28727522
Change-Id: Iecf2e00031d98efbb2a8e2bf0e9386ac8707b48b
 2016-05-16 14:06:19 -07:00
Felipe Leme
c9c7be58a5 Documented return value of getRestrictBackgroundStatus(). 
Change-Id: I2c15a6d5e23cbc3c9b59c975196c1c04c1294471
Fixes: 28775490
 2016-05-16 13:57:19 -07:00
Dianne Hackborn
2ebd57ff94 Fix issue #28794831: meminfo considers cached processes to be services 
Uh how did this ever actually work??

Change-Id: I9823f88847ccda6984bc95227fac90b994c22462
 2016-05-16 13:55:24 -07:00
Dirk Dougherty
9ae42db319 Update default image for n preview docs. Update tools resources. 
Change-Id: I25dcaa9ad0a0b44e84aff49a08481b643b03ea28
 2016-05-16 13:55:23 -07:00
Chris Craik
3741328947 Fix hw layer overdraw/update visualization 
Fixes: 28748255

Change-Id: I83b531cdf5e4407fd17edd72d96e6189924926fa
 2016-05-16 13:54:02 -07:00
Hans Boehm
0d65743fea Clear more native pointers in finalizers 
This hopefully handles the remaining finalizers in frameworks/base
that didn't guard against calls from other finalizers after being
finalized.

The goal here is to reduce the possible corruption causes we have
to think about by a few.

If any of theses are either very frequently used, or use large
Java (as opposed to native) objects, we should probably convert them
to NativeAllocationRegistry instead. But that's more work.

Bug: 18178237
Change-Id: I79bc0e8fa20af8f340418a6226022e0294d77f02
(cherry picked from commit ad3cc3c63c)
 2016-05-16 13:45:21 -07:00