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

140601 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wink Saville
f8458ff9d9 Fix lpdk build. 
Move aidl files from frameworks/opt/net/ims to frameworks/base so lpdk
compiles. The reason is lpdk doesn't have frameworks/base sources so
references to Pending and Bundle in aidl files breaks the pdk build.

I had to move all of them and the ims/*java files for dependency reasons.

Change-Id: I92452562591b157cecdfc01bcd892c4f35f5965c
 2014-06-26 02:37:08 +00:00
Jaewan Kim
226a51958d Update service connections when TV input list is updated 
Bug: 15738607
Change-Id: Ie2d24d0c36308e6757b7d6939d79874c3bdd7211
 2014-06-26 02:00:32 +00:00
Jaewan Kim
4e2de24bf3 Merge "Fix NPE in dumpsys window" 2014-06-24 01:52:26 +00:00
Jaewan Kim
0abc28e114 Fix NPE in dumpsys window 
This crashes with an Android TV without sensor (i.e. TV)

Change-Id: I5e461c6344811686f58860d427598626efdf0184
 2014-06-26 00:40:41 +00:00
Adrian Roos
239d99c4d3 Merge "Trust Agents: Add lock now facility to global actions" 2014-06-24 06:38:28 +00:00
Jason Sams
346d97112e am 6b52ca59: am 89e4c715: am 7165bd6d: Merge "Add check and throw for failed Intrinsic init." 
* commit '6b52ca5949545dcb654672663e2187a70b04f442':
  Add check and throw for failed Intrinsic init.
 2014-06-26 00:32:03 +00:00
Jason Sams
6b52ca5949 am 89e4c715: am 7165bd6d: Merge "Add check and throw for failed Intrinsic init." 
* commit '89e4c715e01f4a2da31a92788547282d699752bf':
  Add check and throw for failed Intrinsic init.
 2014-06-26 00:25:28 +00:00
Jason Sams
89e4c715e0 am 7165bd6d: Merge "Add check and throw for failed Intrinsic init." 
* commit '7165bd6d7496159b426f072bdf13adfffc917a24':
  Add check and throw for failed Intrinsic init.
 2014-06-26 00:20:26 +00:00
Adrian Roos
d4d6136eb3 Trust Agents: Add lock now facility to global actions 
Change-Id: I732d7e989892081f6b53142953de71f90ec62d37
 2014-06-26 01:54:53 +02:00
Adrian Roos
ef1de65117 Trust Agents: Disable until next unlock if device is locked by DPM 
Bug: 15871777
Change-Id: I1a6e43848e600ffa2092282081b18ddf92419d4a
 2014-06-26 01:54:52 +02:00
Joe Fernandez
7265bc4544 am 50cbb708: am c12a1444: am 52e2416c: Merge "docs: fix wear whitelist sign up language to be less confusing" into klp-docs 
* commit '50cbb708b4e6a99b92a646fd548058f1ff4e766c':
  docs: fix wear whitelist sign up language to be less confusing
 2014-06-25 23:00:33 +00:00
smain@google.com
a91c0f6b47 am 603514ad: am 08eb76f4: (-s ours) am 12df4f9e: update wear icons on preview page 
* commit '603514adfc2582e194cf6aed112fd5eab40c529d':
  update wear icons on preview page
 2014-06-25 23:00:30 +00:00
destradaa
5c2395a4d2 am 72e18628: Merge branch \'klp-modular-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-modular-dev 
* commit '72e186283fdef7f6ac56409bf52a5748f6a4749c':
 2014-06-25 23:00:27 +00:00
Robert Ly
b9abab2f42 am 017ec80f: am d0039968: (-s ours) am 2a139d64: Merge "docs: add gms core preview hoop-jumping" into klp-docs 
* commit '017ec80fa1ca1212f9c98dcdbb07d1f0bab938d5':
  docs: add gms core preview hoop-jumping
 2014-06-25 23:00:16 +00:00
Joe Fernandez
50cbb708b4 am c12a1444: am 52e2416c: Merge "docs: fix wear whitelist sign up language to be less confusing" into klp-docs 
* commit 'c12a14442734085f2f1d7f3a38e634331537b08e':
  docs: fix wear whitelist sign up language to be less confusing
 2014-06-25 22:55:14 +00:00
smain@google.com
603514adfc am 08eb76f4: (-s ours) am 12df4f9e: update wear icons on preview page 
* commit '08eb76f42ed53ea3967a4559d9e60a961f9450b5':
  update wear icons on preview page
 2014-06-25 22:55:13 +00:00
destradaa
72e186283f Merge branch 'klp-modular-dev' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-modular-dev 2014-06-25 22:55:07 +00:00
Joe Fernandez
c12a144427 am 52e2416c: Merge "docs: fix wear whitelist sign up language to be less confusing" into klp-docs 
* commit '52e2416cc72f7d87e2f7f1aa29b7a9cb85ae0c70':
  docs: fix wear whitelist sign up language to be less confusing
 2014-06-25 22:49:36 +00:00
smain@google.com
58b170e84a am 8f414479: fix back link for preview nav 
* commit '8f414479f91f73c3b8432ca93991ba643b9c846f':
  fix back link for preview nav
 2014-06-25 22:32:26 +00:00
smain@google.com
8f414479f9 fix back link for preview nav 
Change-Id: I684129ba5c43d49ff52410939e8b034ccc4877ad
 2014-06-25 15:19:28 -07:00
Robert Ly
fa8ad32716 am ed929960: Merge "docs: add gcore instructions for preview" into klp-modular-dev 
* commit 'ed929960584cba38a81b49cff597dba59d50a0a7':
  docs: add gcore instructions for preview
 2014-06-25 21:38:49 +00:00
Adrian Roos
2c12cfa1d5 Trust Agents: Add facility to request credential entry 
Bug: 15871777
Change-Id: I43c80151f6403ff62961aeb3dc7aafe049e18a62
 2014-06-25 23:28:53 +02:00
smain@google.com
a16f0958fc am 8f832719: Merge "add license wall to downloading the L Preview system images" into klp-modular-dev 
* commit '8f832719632cdbcbcc555c94f898ddbf38174de9':
  add license wall to downloading the L Preview system images
 2014-06-25 21:28:15 +00:00
Joe Fernandez
02ea12eabf am 54c6e0aa: Merge "Final L-Preview Guidelines for Android TV Games Staged at http://boku.mtv.corp.google.com:9195/preview/tv/games/index.html" into klp-modular-dev 
* commit '54c6e0aa1f27e5ecf3db64710563a305d78e9d39':
  Final L-Preview Guidelines for Android TV Games Staged at http://boku.mtv.corp.google.com:9195/preview/tv/games/index.html
 2014-06-25 20:53:54 +00:00
Stephen Hines
af97f87a47 am 6d38cec1: am 924ed1fa: Merge "Switch from size_t -> uint32_t for dimensions array." 
* commit '6d38cec12baa98fc50abd033eddd359a66843efa':
  Switch from size_t -> uint32_t for dimensions array.
 2014-06-25 20:50:26 +00:00
Stephen Hines
6d38cec12b am 924ed1fa: Merge "Switch from size_t -> uint32_t for dimensions array." 
* commit '924ed1fae19ba70b5c6267b977ae8c72b63fe99a':
  Switch from size_t -> uint32_t for dimensions array.
 2014-06-25 20:44:09 +00:00
Robert Ly
017ec80fa1 am d0039968: (-s ours) am 2a139d64: Merge "docs: add gms core preview hoop-jumping" into klp-docs 
* commit 'd0039968fa6caafcbb39e9613af75686a2f1ce46':
  docs: add gms core preview hoop-jumping
 2014-06-25 19:29:45 +00:00
smain@google.com
3edaf370e3 am d9d9d335: am 80c07fb9: am ec6f162f: DO NOT MERGE! 
* commit 'd9d9d335fbd88d77ad10f5850e824c72c85bcfb0':
  DO NOT MERGE!
 2014-06-25 19:25:30 +00:00
smain@google.com
d01b9d7c47 am 92fd15a3: am 5f4a2b83: (-s ours) am 53126416: DO NOT MERGE! 
* commit '92fd15a31f54a76900c2fc27d19ef5313eeeec6f':
  DO NOT MERGE!
  DO NOT MERGE Revert "Revert "add 'coming soon' page for google io announcements""
 2014-06-25 19:25:26 +00:00
Scott Main
31e3f69e04 am 62b2d414: am 1b4a9dbf: (-s ours) am 87670bcb: Revert "add \'coming soon\' page for google io announcements" 
* commit '62b2d414e194b41fc1a745b98cb6e608ec22c523':
  Revert "add 'coming soon' page for google io announcements"
 2014-06-25 19:25:22 +00:00
smain@google.com
83985711ad am 7ac0aa1e: am bf5d1a93: (-s ours) am cca2a91a: add \'coming soon\' page for google io announcements 
* commit '7ac0aa1ea3b282b375a8fedd572f30145299b10a':
  add 'coming soon' page for google io announcements
 2014-06-25 19:25:18 +00:00
smain@google.com
d9d9d335fb am 80c07fb9: am ec6f162f: DO NOT MERGE! 
* commit '80c07fb99b5a923ffd35e1b8e4cff64197074aa5':
  DO NOT MERGE!
 2014-06-25 19:21:08 +00:00
smain@google.com
92fd15a31f am 5f4a2b83: (-s ours) am 53126416: DO NOT MERGE! 
* commit '5f4a2b83850868fa5898661cb2555e54023060c0':
  DO NOT MERGE!
  DO NOT MERGE Revert "Revert "add 'coming soon' page for google io announcements""
 2014-06-25 19:21:04 +00:00
Scott Main
62b2d414e1 am 1b4a9dbf: (-s ours) am 87670bcb: Revert "add \'coming soon\' page for google io announcements" 
* commit '1b4a9dbf832870fc0ffc17212d10b34e61d4c943':
  Revert "add 'coming soon' page for google io announcements"
 2014-06-25 19:12:48 +00:00
Robert Ly
1e1ca756a9 am 823ce529: Merge "fix build" into klp-modular-dev 
* commit '823ce5298fec4d0d9f5773ce16af882e633f1f16':
  fix build
 2014-06-25 19:12:46 +00:00
Baligh Uddin
29004a82a0 am 259b1fa6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit '259b1fa686dccdc4924aa3140d07865df85325db':
  Import translations. DO NOT MERGE
 2014-06-25 19:12:41 +00:00
Baligh Uddin
55567819af am 2243f194: (-s ours) Import translations. DO NOT MERGE 
* commit '2243f19498bdccec4a35f35913582576cc52439d':
  Import translations. DO NOT MERGE
 2014-06-25 19:12:37 +00:00
Robert Ly
161ca5d261 am 6e35f209: Merge "docs:wear landing and training fixes" into klp-modular-dev 
* commit '6e35f209d62eb814383ae22e96384a55b5e3387e':
  docs:wear landing and training fixes
 2014-06-25 19:12:19 +00:00
Ricardo Cervera
ce6fe5b7c9 am 0ac4b32d: docs: Updated Renault logo on the Auto site 
* commit '0ac4b32d58e411244dbea77e02950b569b7ecd69':
  docs: Updated Renault logo on the Auto site
 2014-06-25 19:12:15 +00:00
Joe Fernandez
425d710852 am 1262f85d: Merge "Android TV Landing page, final (probably)" into klp-modular-dev 
* commit '1262f85d24e03df0ed8cf8b0fa141888ed6da609':
  Android TV Landing page, final (probably)
 2014-06-25 19:12:10 +00:00
Robert Ly
992112f672 am 18ec4186: fix samples page 
* commit '18ec418657bd09b2587ded808a2660b3a5e1aefd':
  fix samples page
 2014-06-25 19:12:07 +00:00
Robert Ly
3f737f2cae am e1beb730: Merge "docs: wear training classes" into klp-modular-dev 
* commit 'e1beb730c32348d2a7f194a566eef6e5ed541b3b':
  docs: wear training classes
 2014-06-25 19:12:01 +00:00
Robert Ly
27ff7a5819 am 8c51ee84: Merge "docs: add gms core hoop jumping" into klp-modular-dev 
* commit '8c51ee840916a8c0cd1598e1681f7f83141ea829':
  docs: add gms core hoop jumping
 2014-06-25 19:11:57 +00:00
Joe Fernandez
19e4a28a44 am 4c4f8b32: Merge "docs: Fixes for Android TV Dev Guide" into klp-modular-dev 
* commit '4c4f8b32a0b492ca804f19eadc2143b146836027':
  docs: Fixes for Android TV Dev Guide
 2014-06-25 19:11:52 +00:00
smain@google.com
7ac0aa1ea3 am bf5d1a93: (-s ours) am cca2a91a: add \'coming soon\' page for google io announcements 
* commit 'bf5d1a93aa585124c110c950a2584212a7d19a6f':
  add 'coming soon' page for google io announcements
 2014-06-25 19:06:23 +00:00
smain@google.com
08eb76f42e am 12df4f9e: update wear icons on preview page 
* commit '12df4f9ef19b49147f700cfa95fb73517540b033':
  update wear icons on preview page
 2014-06-25 18:14:11 +00:00
smain@google.com
12df4f9ef1 update wear icons on preview page 
Change-Id: I17fc5a7d1ba637ea0eb557eae50aea76667e2430
 2014-06-25 11:08:40 -07:00
Jason Sams
7165bd6d74 Merge "Add check and throw for failed Intrinsic init." 2014-06-25 17:35:00 +00:00
Robert Ly
ed92996058 Merge "docs: add gcore instructions for preview" into klp-modular-dev 2014-06-25 17:34:07 +00:00
Robert Ly
a67bb26352 docs: add gcore instructions for preview 
Change-Id: I51913920a00cb197682393f04ba3e7a96074202f
 2014-06-25 13:02:29 -07:00