drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
154,365 Commits 1 Branch 0 Tags
Commit Graph

154365 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Griff Hazen
732e4ecbee DO NOT MERGE Fix lmp-sprout-dev build for generics addition 
Change-Id: I66f10264476df5504086a7fbc24d729798187d05
 2014-10-27 19:19:22 -07:00
Jason Monk
07faf0e1a1 Add missing passive discovery flag 
automerge: 4444c5b

* commit '4444c5b27874866f18cd8f4abb8914cc17857ea7':
  Add missing passive discovery flag
 2014-10-28 00:52:56 +00:00
Jason Monk
4444c5b278 Add missing passive discovery flag 
MediaProjectionManagerService had an active media callback which
was causing a service to be bound 100% of the time.  Adding a
passive flag makes it only observe events, and allow the service
to only be bound when needed by apps requesting active discovery.

Bug: 18042409
Bug: 17969854
Change-Id: I1bfa6609e2aa507ee2ce227de50f0e5ae951e000
 2014-10-27 19:25:50 -04:00
Ying Wang
475d7393bf Update current.txt with generics to field types. 
automerge: 79775d4

* commit '79775d4bc4fa71994942dbd1d441aa62827c34be':
  Update current.txt with generics to field types.
 2014-10-27 22:35:59 +00:00
Ying Wang
79775d4bc4 Update current.txt with generics to field types. 
Bug: 17014855
Change-Id: I14672092f79374f6c5b2362bd3c2aaac84e0c2ae
 2014-10-27 11:25:19 -07:00
Geoff Mendal
5a1a14a817 Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-10-27 15:55:19 +00:00
Geoff Mendal
ad66c3b0b1 Import translations. DO NOT MERGE 
Change-Id: I4fc460aa64d5ea79e6ac16ce7b700b9a316819d1
Auto-generated-cl: translation import
 2014-10-27 08:53:05 -07:00
Geoff Mendal
b3a33967d2 Import translations. DO NOT MERGE 
Change-Id: I6bbba14271ba04f3e4b4836f3e81a22d1c53938f
Auto-generated-cl: translation import
 2014-10-27 06:33:49 -07:00
Joe Fernandez
956ee53b07 am 4fee8c89: docs: Home page - fix card images that are showing up on the home page 
* commit '4fee8c89eb49d4935b4a2725f82d3a08f6a938d3':
  docs: Home page - fix card images that are showing up on the home page
 2014-10-25 09:15:06 +00:00
Joe Fernandez
4fee8c89eb docs: Home page - fix card images that are showing up on the home page 
Change-Id: I943b9b819f91069f961c5f93b14f01499f587e19
 2014-10-25 01:46:20 -07:00
Luan Nguyen
fba8fddfdc am 781fe92c: Merge "docs: Fix metadata description. Add new gesture test. Split layout test." into lmp-dev 
* commit '781fe92cfdb96cb8f67d06b4d2500d11a3310550':
  docs: Fix metadata description. Add new gesture test. Split layout test.
 2014-10-24 23:30:37 +00:00
Luan Nguyen
781fe92cfd Merge "docs: Fix metadata description. Add new gesture test. Split layout test." into lmp-dev 2014-10-24 23:17:24 +00:00
Luan Nguyen
03b74e1947 am bfcc2e1a: am aec7c974: am 049db36a: Merge "docs: fixed typo/grammar issues." into klp-modular-docs 
* commit 'bfcc2e1a88e45027d2ba17302cb2fb35fbce3506':
  docs: fixed typo/grammar issues.
 2014-10-24 23:04:53 +00:00
Joe Fernandez
65dca4ec32 am abb8ea3d: am 90f734eb: am 0e893eb7: Merge "docs:Added 64-bit image note from Preview page" into klp-modular-docs 
* commit 'abb8ea3d4be376b0816b791c1afd3cc78300e9d4':
  docs:Added 64-bit image note from Preview page
 2014-10-24 23:04:49 +00:00
Natalie Masse
0fbbed83a6 am 60144a7a: am bcf9ced4: am 1e5bb861: Link and typo fixed 
* commit '60144a7a06d818e7ef22d08722be67c602aeb088':
  Link and typo fixed
 2014-10-24 23:04:46 +00:00
Luan Nguyen
bfcc2e1a88 am aec7c974: am 049db36a: Merge "docs: fixed typo/grammar issues." into klp-modular-docs 
* commit 'aec7c974eb223b5608bbd2bb06e11fc397e6ffb2':
  docs: fixed typo/grammar issues.
 2014-10-24 22:37:25 +00:00
Joe Fernandez
abb8ea3d4b am 90f734eb: am 0e893eb7: Merge "docs:Added 64-bit image note from Preview page" into klp-modular-docs 
* commit '90f734eb180619eb8ffd2e30580f72b500184f8b':
  docs:Added 64-bit image note from Preview page
 2014-10-24 22:37:16 +00:00
Natalie Masse
60144a7a06 am bcf9ced4: am 1e5bb861: Link and typo fixed 
* commit 'bcf9ced47a123220271fcca70f71c2adf69ad100':
  Link and typo fixed
 2014-10-24 22:36:54 +00:00
Luan Nguyen
9e8a84a115 docs: Fix metadata description. Add new gesture test. Split layout test. 
Change-Id: I5a8948594af94fa1e7548fc49a0c3946f03d7fc8
 2014-10-24 15:17:39 -07:00
Paul Lawrence
0e6178b81e am c220d8e5: Stop crypto UI from crashing during encryption 
* commit 'c220d8e57ca97c70db1fd72f040bd6c6f70bbf13':
  Stop crypto UI from crashing during encryption
 2014-10-24 20:08:33 +00:00
Paul Lawrence
c220d8e57c Stop crypto UI from crashing during encryption 
Don't try to read crypto meta data during this time

Bug: 18037893
Change-Id: I3628572b3b90e6fc0a7c71089b447fb0e5303ee9
 2014-10-24 10:37:40 -07:00
Luan Nguyen
aec7c974eb am 049db36a: Merge "docs: fixed typo/grammar issues." into klp-modular-docs 
* commit '049db36afd63b972f971f8bac6a405bc2f9437f4':
  docs: fixed typo/grammar issues.
 2014-10-24 15:59:44 +00:00
Luan Nguyen
049db36afd Merge "docs: fixed typo/grammar issues." into klp-modular-docs 2014-10-24 15:55:48 +00:00
Joe Fernandez
90f734eb18 am 0e893eb7: Merge "docs:Added 64-bit image note from Preview page" into klp-modular-docs 
* commit '0e893eb7ac1985a02d61525a5e6076d45a1e8c7d':
  docs:Added 64-bit image note from Preview page
 2014-10-24 09:27:02 +00:00
Natalie Masse
bcf9ced47a am 1e5bb861: Link and typo fixed 
* commit '1e5bb861265072b9af555d09202e49cb38a3c4f1':
  Link and typo fixed
 2014-10-24 08:13:36 +00:00
Joe Fernandez
57f1fd1993 am cab73381: Merge "docs: Fix typo in search class" into lmp-dev 
* commit 'cab733811554ffcf257ee194a5245521713faf5d':
  docs: Fix typo in search class
 2014-10-24 06:08:43 +00:00
Joe Fernandez
458128603f am 553dd209: Merge "docs: Fixed 404 link in SDK Tools page." into lmp-dev 
* commit '553dd209992ffe9bba1160333762c5f3fa6651b0':
  docs: Fixed 404 link in SDK Tools page.
 2014-10-24 06:08:40 +00:00
Joe Fernandez
0e893eb7ac Merge "docs:Added 64-bit image note from Preview page" into klp-modular-docs 2014-10-24 06:06:01 +00:00
Joe Fernandez
c53546e9c2 am 3b6d518e: Merge "docs: Fix hprof-conv location in docs." into lmp-dev 
* commit '3b6d518e79c1045286d2bc368148b44dd1a39bf3':
  docs: Fix hprof-conv location in docs.
 2014-10-24 06:02:35 +00:00
Joe Fernandez
b118395346 am 4ae8b8f3: Merge "docs: Fixing misc minor bugs." into lmp-dev 
* commit '4ae8b8f3652ed2382ee5593151ea72b315fb5384':
  docs: Fixing misc minor bugs.
 2014-10-24 06:02:31 +00:00
Joe Fernandez
cab7338115 Merge "docs: Fix typo in search class" into lmp-dev 2014-10-24 06:01:57 +00:00
Joe Fernandez
553dd20999 Merge "docs: Fixed 404 link in SDK Tools page." into lmp-dev 2014-10-24 06:00:56 +00:00
Joe Fernandez
3b6d518e79 Merge "docs: Fix hprof-conv location in docs." into lmp-dev 2014-10-24 06:00:19 +00:00
Joe Fernandez
4ae8b8f365 Merge "docs: Fixing misc minor bugs." into lmp-dev 2014-10-24 05:59:04 +00:00
Hochi Huang
4a7873f19a [FM]Fix FM App record fail Buganizer ID: 17975676 
Signed-off-by: Hochi Huang <hochi.huang@mediatek.com>
    Review: https://partner-android-review.git.corp.google.com/#/c/185235

Change-Id: I024db429b8ff56851c814857691b06ea5e69198a
 2014-10-24 00:47:54 +00:00
Luan Nguyen
fd73db2257 am 578210db: Merge "docs: Update thumbnail images for resources, update minor text for WR-GS, and update the title image resolution." into lmp-dev 
* commit '578210db199f41dc7c14e53ba925956de835f3c0':
  docs: Update thumbnail images for resources, update minor text for WR-GS, and update the title image resolution.
 2014-10-23 22:51:09 +00:00
Luan Nguyen
578210db19 Merge "docs: Update thumbnail images for resources, update minor text for WR-GS, and update the title image resolution." into lmp-dev 2014-10-23 22:45:03 +00:00
Trevor Johns
2988436b65 am fb28bd15: Merge "Docs: Add TOC page for Wearable samples" into lmp-dev 
* commit 'fb28bd158dd387225bb55e31da60101436e7b13c':
  Docs: Add TOC page for Wearable samples
 2014-10-23 21:52:47 +00:00
Legler Wu
c11a944a57 [DS] Change the copyright 
Change the copyright as Android.

    Review: https://partner-android-review.git.corp.google.com/#/c/185241

Change-Id: Id548867805a65c2887ca19cb79d155b5a8c82753
 2014-10-23 20:27:51 +00:00
Luan Nguyen
912abbedee docs: Update thumbnail images for resources, update minor text for WR-GS, and 
update the title image resolution.

Change-Id: I83e89e3969bd6b837074e86a810cf801be3a6caf
 2014-10-23 13:04:29 -07:00
Nancy Chen
0145e17db7 Merge "Add getter methods in SubInfoRecord for UI. Adapt PhoneAccount." into lmp-sprout-dev 2014-10-23 19:08:20 +00:00
Filip Gruszczynski
625ec48491 Check if context is actually an activity. 
Bug: 18101409
Change-Id: Iab21338ef4ccaab0ce66d664502e0b5e88ad9c50
 2014-10-23 10:56:24 -07:00
Trevor Johns
fb28bd158d Merge "Docs: Add TOC page for Wearable samples" into lmp-dev 2014-10-23 16:51:39 +00:00
Trevor Johns
abcb138da8 Docs: Add TOC page for Wearable samples 
Change-Id: I0fdf412f20fb2a45c34c9700ed1ca9446cfc6ff3
 2014-10-23 09:29:05 -07:00
Ricardo Cervera
ce3d72e4ad am 8755d9a5: Merge "docs: Updating dependency vers nums for support libs." into lmp-dev 
* commit '8755d9a5361d716433505e883986e8bf5f28d041':
  docs: Updating dependency vers nums for support libs.
 2014-10-23 15:43:48 +00:00
Ricardo Cervera
92ddea1894 am 30d0b242: Merge "docs: Support lib dependency fix. Bug: 18029377" into lmp-dev 
* commit '30d0b24280abe4b2c5e1e20819d87f60d34964de':
  docs: Support lib dependency fix. Bug: 18029377
 2014-10-23 15:43:44 +00:00
Ricardo Cervera
8755d9a536 Merge "docs: Updating dependency vers nums for support libs." into lmp-dev 2014-10-23 15:10:09 +00:00
Ricardo Cervera
30d0b24280 Merge "docs: Support lib dependency fix. Bug: 18029377" into lmp-dev 2014-10-23 15:09:42 +00:00
Joe Fernandez
3bd3a9c105 am 7c2bfa2e: Merge "docs: Add Wear App Quality checklist" into lmp-dev 
* commit '7c2bfa2eae3d59b0a876e54c4c6b4f21ea997e89':
  docs: Add Wear App Quality checklist
 2014-10-23 07:55:41 +00:00
Trevor Johns
5111993f83 am fdb02fcf: Merge "Docs: Update /samples/new/index.html for Clockwork Beryl release" into lmp-dev 
* commit 'fdb02fcf9c8b55252f4375c2f3e8b4872432cbc8':
  Docs: Update /samples/new/index.html for Clockwork Beryl release
 2014-10-23 07:55:38 +00:00