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

175685 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chad Brubaker
6050eb5459 am 5b11b3d6: am 31cee318: Merge "Specify public exponent for RSA" 
* commit '5b11b3d6c50c9fc705ae73a2ffcc4b9b57f96c78':
  Specify public exponent for RSA
 2015-03-21 19:37:46 +00:00
Chad Brubaker
5b11b3d6c5 am 31cee318: Merge "Specify public exponent for RSA" 
* commit '31cee318f0494e6d77fc55599f285f534435405e':
  Specify public exponent for RSA
 2015-03-21 19:31:22 +00:00
Chad Brubaker
31cee318f0 Merge "Specify public exponent for RSA" 2015-03-21 19:18:25 +00:00
Geoff Mendal
7163a0a1a6 am 57d7b5f4: (-s ours) am 1f9bad3c: (-s ours) Import translations. DO NOT MERGE 
* commit '57d7b5f4eab81c0f9a61d5069b74ca034982a5f5':
  Import translations. DO NOT MERGE
 2015-03-21 16:21:31 +00:00
Geoff Mendal
57d7b5f4ea am 1f9bad3c: (-s ours) Import translations. DO NOT MERGE 
* commit '1f9bad3cb98964aaaecc2266102348b85d6fae9a':
  Import translations. DO NOT MERGE
 2015-03-21 15:34:55 +00:00
Geoff Mendal
d4f45766fa Import translations. DO NOT MERGE 
Change-Id: I6ead0981923edc795695e1419ae5dfff28c5fb5c
Auto-generated-cl: translation import
 2015-03-20 23:24:42 -07:00
Geoff Mendal
1f9bad3cb9 Import translations. DO NOT MERGE 
Change-Id: I59ad105e99dbd4c8bd19c4e94eecd6e19425345a
Auto-generated-cl: translation import
 2015-03-20 23:15:45 -07:00
Jeff Brown
13d81b6dd2 am 619ce1ce: am d6216305: Merge "Disable more hotkeys while in setup." into lmp-mr1-dev 
* commit '619ce1ce534775ab0ff4d591a69dafd53c04a315':
  Disable more hotkeys while in setup.
 2015-03-20 22:35:41 +00:00
Jeff Brown
619ce1ce53 am d6216305: Merge "Disable more hotkeys while in setup." into lmp-mr1-dev 
* commit 'd62163055f983b95a954f1a6c2cbc8e0085a7ab5':
  Disable more hotkeys while in setup.
 2015-03-20 22:10:54 +00:00
Jeff Brown
d62163055f Merge "Disable more hotkeys while in setup." into lmp-mr1-dev 2015-03-20 22:05:07 +00:00
Chad Brubaker
003a55a671 Specify public exponent for RSA 
Keymaster no longer adds a default value, so these tests were failing.

Change-Id: I9c5a8d2552534db1d7fa77965b0d675acc3ccc0a
 2015-03-20 14:03:49 -07:00
Jeff Brown
38d3feb76c Disable more hotkeys while in setup. 
Disables fallback key processing for CALL, CAMERA, and HEADSETHOOK
buttons.

Bug: 19767816
Change-Id: I423103c367e05827c939cd8d8dbecb6012b0e9f0
 2015-03-20 13:26:09 -07:00
Alex Klyubin
2110a28a6c am a4c4c575: Merge "Add android.security.NetworkSecurityPolicy." 
* commit 'a4c4c575c793d3ba4847107b15ce3a9dd5395878':
  Add android.security.NetworkSecurityPolicy.
 2015-03-20 18:08:30 +00:00
Alex Klyubin
a4c4c575c7 Merge "Add android.security.NetworkSecurityPolicy." 2015-03-20 17:56:25 +00:00
Zach Riggle
685d33dd18 am 104a29b6: am a7dbe970: am 901e4008: am a6e7a9b5: am 6a5b2110: Merge "Fix NPE in FlashlightController" into lmp-dev 
* commit '104a29b6b5fe6e454787053ca72950dbbc4d424b':
  Fix NPE in FlashlightController
 2015-03-19 23:42:58 +00:00
Zach Riggle
104a29b6b5 am a7dbe970: am 901e4008: am a6e7a9b5: am 6a5b2110: Merge "Fix NPE in FlashlightController" into lmp-dev 
* commit 'a7dbe970bc8f6c90b4e68ffd2146f988aca85ac0':
  Fix NPE in FlashlightController
 2015-03-19 23:35:20 +00:00
Yang Ni
53699ec613 am d3e6428a: Merge "New API methods for Script Group" 
* commit 'd3e6428aea34ce3297123c63b4dd6223dac5d5a8':
  New API methods for Script Group
 2015-03-19 23:35:14 +00:00
Zach Riggle
a7dbe970bc am 901e4008: am a6e7a9b5: am 6a5b2110: Merge "Fix NPE in FlashlightController" into lmp-dev 
* commit '901e400826e76f0eaa9d05cca20c1696bf86db67':
  Fix NPE in FlashlightController
 2015-03-19 23:29:06 +00:00
Zach Riggle
901e400826 am a6e7a9b5: am 6a5b2110: Merge "Fix NPE in FlashlightController" into lmp-dev 
* commit 'a6e7a9b50d0866fac57447496e4207d91c68c806':
  Fix NPE in FlashlightController
 2015-03-19 23:22:10 +00:00
Yang Ni
d3e6428aea Merge "New API methods for Script Group" 2015-03-19 23:21:28 +00:00
Zach Riggle
a6e7a9b50d am 6a5b2110: Merge "Fix NPE in FlashlightController" into lmp-dev 
* commit '6a5b2110eb0adbf8b9d53cf86a931b6067691f14':
  Fix NPE in FlashlightController
 2015-03-19 23:15:02 +00:00
Zach Riggle
6a5b2110eb Merge "Fix NPE in FlashlightController" into lmp-dev 2015-03-19 23:09:33 +00:00
smain@google.com
62c595aaee am 6784cf99: am 092a7893: am d5fdc287: am 3bc84b18: am 910ca415: am 4b53dc8b: Merge "add Places API to the Location feature page" into lmp-docs 
* commit '6784cf9945e01de63f67ed11a4925fa9879f2073':
  add Places API to the Location feature page
 2015-03-19 22:55:38 +00:00
smain@google.com
6784cf9945 am 092a7893: am d5fdc287: am 3bc84b18: am 910ca415: am 4b53dc8b: Merge "add Places API to the Location feature page" into lmp-docs 
* commit '092a7893779455ca9d1a0ff34d9ccefb9ae709db':
  add Places API to the Location feature page
 2015-03-19 22:48:07 +00:00
smain@google.com
092a789377 am d5fdc287: am 3bc84b18: am 910ca415: am 4b53dc8b: Merge "add Places API to the Location feature page" into lmp-docs 
* commit 'd5fdc2870079876cd5d8407773aa73225a12c044':
  add Places API to the Location feature page
 2015-03-19 22:42:44 +00:00
smain@google.com
d5fdc28700 am 3bc84b18: am 910ca415: am 4b53dc8b: Merge "add Places API to the Location feature page" into lmp-docs 
* commit '3bc84b18b74cd14d98c81ea263b3ca49549a590c':
  add Places API to the Location feature page
 2015-03-19 22:35:16 +00:00
smain@google.com
3bc84b18b7 am 910ca415: am 4b53dc8b: Merge "add Places API to the Location feature page" into lmp-docs 
* commit '910ca415587c6b7f7a004cc381c36352c021c12b':
  add Places API to the Location feature page
 2015-03-19 22:29:09 +00:00
smain@google.com
910ca41558 am 4b53dc8b: Merge "add Places API to the Location feature page" into lmp-docs 
* commit '4b53dc8bae0cc3f84e20765ea35ea3eab0371134':
  add Places API to the Location feature page
 2015-03-19 22:22:10 +00:00
smain@google.com
4b53dc8bae Merge "add Places API to the Location feature page" into lmp-docs 2015-03-19 22:16:12 +00:00
Yang Ni
f2ea01717b am c077ee31: Merge "Added copyright notice and formatted to convention" 
* commit 'c077ee316e0f6f50ade552f51ae657a08e423eaa':
  Added copyright notice and formatted to convention
 2015-03-19 21:41:59 +00:00
Yang Ni
8ff2980f31 New API methods for Script Group 
Use a single vararg Object array for both kernel/invoke arguments
and global bindings. The assumption is that global bindings are in
the end after the kernel/invoke arguments.
This simplifies the api to add a kernel or invoke to a script group.

Change-Id: I7efb1035c5967e2cadd15e6fe27f20c80ba197a2
 2015-03-19 14:38:20 -07:00
Bryce Lee
b45d3926f3 am 8320cf2d: Merge "Fix wrong intent being passed in PhoneWindowManager." into lmp-mr1-modular-dev 
* commit '8320cf2de357265179c3007256394b0cbb69d949':
  Fix wrong intent being passed in PhoneWindowManager.
 2015-03-19 21:30:43 +00:00
Yang Ni
c077ee316e Merge "Added copyright notice and formatted to convention" 2015-03-19 21:28:13 +00:00
Bryce Lee
8320cf2de3 Merge "Fix wrong intent being passed in PhoneWindowManager." into lmp-mr1-modular-dev 2015-03-19 21:24:52 +00:00
Joe Fernandez
33e84c1678 am 8ca83e05: am 0362d6e0: am bb777ef4: am b88bce21: am c773358d: am dd461b29: Merge "RESUBMIT: "Doc change: add docs for SafetyNet API.""" into lmp-docs 
* commit '8ca83e0504cb3b8d78c1a07bd49a73c58433671b':
  RESUBMIT: "Doc change: add docs for SafetyNet API.""
 2015-03-19 20:56:45 +00:00
Joe Fernandez
5827349328 am 1e81b070: am e41abf4a: am 43929db6: am f761e4c2: am d91167e8: am 80f947c8: Merge "RESUBMIT: "docs: Updated \'What\'s New\' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""" int 
* commit '1e81b070f772fdef45d7bedc0de0304603e05a95':
  RESUBMIT: "docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""
 2015-03-19 20:56:33 +00:00
Joe Fernandez
b89cdf1ef4 am 5c1a3ab4: am d7df900a: am a06c8ff0: am 36b2c160: am bacdd2b8: am ef7d8081: Merge "RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""" into lmp-docs 
* commit '5c1a3ab4216333696947eefee4d022f708e4c053':
  RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""
 2015-03-19 20:56:25 +00:00
Joe Fernandez
8ca83e0504 am 0362d6e0: am bb777ef4: am b88bce21: am c773358d: am dd461b29: Merge "RESUBMIT: "Doc change: add docs for SafetyNet API.""" into lmp-docs 
* commit '0362d6e0c836cd48beb928f053d97dcc3961c110':
  RESUBMIT: "Doc change: add docs for SafetyNet API.""
 2015-03-19 20:49:52 +00:00
Joe Fernandez
1e81b070f7 am e41abf4a: am 43929db6: am f761e4c2: am d91167e8: am 80f947c8: Merge "RESUBMIT: "docs: Updated \'What\'s New\' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""" into lmp-docs 
* commit 'e41abf4a304675bda37de7b796258f7f322d61ea':
  RESUBMIT: "docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""
 2015-03-19 20:49:48 +00:00
Joe Fernandez
5c1a3ab421 am d7df900a: am a06c8ff0: am 36b2c160: am bacdd2b8: am ef7d8081: Merge "RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""" into lmp-docs 
* commit 'd7df900a80f4c7af1f16efc0a8bcf044a2a7ff4d':
  RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""
 2015-03-19 20:49:41 +00:00
Miao Wang
f8a69f562b am 2ef9955c: Merge "[RenderScript] Remove duplicate include in jni" 
* commit '2ef9955c827e0348a65b4f787e206925f4663197':
  [RenderScript] Remove duplicate include in jni
 2015-03-19 20:49:15 +00:00
Eric Gilmore
3e90fa5908 am 680f36a8: am 66e529aa: am 1f07cfb6: am 0fdeefbd: am cf1586d3: am e43a64e3: Merge "Changes for a quick, pre-migration bug sprint:" into lmp-docs 
* commit '680f36a88ff1c43e928066122505ec05c50d9942':
  Changes for a quick, pre-migration bug sprint:
 2015-03-19 20:46:28 +00:00
Joe Fernandez
0362d6e0c8 am bb777ef4: am b88bce21: am c773358d: am dd461b29: Merge "RESUBMIT: "Doc change: add docs for SafetyNet API.""" into lmp-docs 
* commit 'bb777ef40d7a181e782dfce652c3d9da390dc9f5':
  RESUBMIT: "Doc change: add docs for SafetyNet API.""
 2015-03-19 20:42:36 +00:00
Joe Fernandez
e41abf4a30 am 43929db6: am f761e4c2: am d91167e8: am 80f947c8: Merge "RESUBMIT: "docs: Updated \'What\'s New\' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""" into lmp-docs 
* commit '43929db6487f295c4bca1a499a5299da77ad2161':
  RESUBMIT: "docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""
 2015-03-19 20:42:30 +00:00
Joe Fernandez
d7df900a80 am a06c8ff0: am 36b2c160: am bacdd2b8: am ef7d8081: Merge "RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""" into lmp-docs 
* commit 'a06c8ff08ea783d4e0e3bdb1a46bf6a4a382a58c':
  RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""
 2015-03-19 20:42:23 +00:00
Eric Gilmore
680f36a88f am 66e529aa: am 1f07cfb6: am 0fdeefbd: am cf1586d3: am e43a64e3: Merge "Changes for a quick, pre-migration bug sprint:" into lmp-docs 
* commit '66e529aa34034d044c496c330ba89026ee293253':
  Changes for a quick, pre-migration bug sprint:
 2015-03-19 20:38:49 +00:00
Miao Wang
2ef9955c82 Merge "[RenderScript] Remove duplicate include in jni" 2015-03-19 20:35:56 +00:00
Joe Fernandez
bb777ef40d am b88bce21: am c773358d: am dd461b29: Merge "RESUBMIT: "Doc change: add docs for SafetyNet API.""" into lmp-docs 
* commit 'b88bce219abf7fcad50ac105183bd79da0b9893c':
  RESUBMIT: "Doc change: add docs for SafetyNet API.""
 2015-03-19 20:35:09 +00:00
Joe Fernandez
43929db648 am f761e4c2: am d91167e8: am 80f947c8: Merge "RESUBMIT: "docs: Updated \'What\'s New\' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""" into lmp-docs 
* commit 'f761e4c20ee63873043522990487ecd15bb18966':
  RESUBMIT: "docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""
 2015-03-19 20:35:05 +00:00
Joe Fernandez
a06c8ff08e am 36b2c160: am bacdd2b8: am ef7d8081: Merge "RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""" into lmp-docs 
* commit '36b2c1609d17317bb9d3977e46ada21275f54d65':
  RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""
 2015-03-19 20:34:59 +00:00