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

106596 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dirk Dougherty
c5663c9f7c am 8154d293: am 58c68d77: Merge "Doc change: Updated reference docs for Google Play Services 3.2." into jb-mr2-docs 
* commit '8154d2932a3e4f9800eeff18da640fda7a169ec8':
  Doc change: Updated reference docs for Google Play Services 3.2.
 2013-08-06 09:32:56 -07:00
Dirk Dougherty
8154d2932a am 58c68d77: Merge "Doc change: Updated reference docs for Google Play Services 3.2." into jb-mr2-docs 
* commit '58c68d77596dc81ac6715c8bc7785d1cc430929f':
  Doc change: Updated reference docs for Google Play Services 3.2.
 2013-08-06 09:30:12 -07:00
Dirk Dougherty
58c68d7759 Merge "Doc change: Updated reference docs for Google Play Services 3.2." into jb-mr2-docs 2013-08-06 07:35:28 +00:00
Wink Saville
9fe49fc56e am 523db46f: Merge "Set subscription_mode in the database to a default value" 
* commit '523db46f6981a40e12007dbbe629bbdc47f861ba':
  Set subscription_mode in the database to a default value
 2013-08-05 17:20:13 -07:00
Wink Saville
523db46f69 Merge "Set subscription_mode in the database to a default value" 2013-08-06 00:10:03 +00:00
Xia Wang
3a5e2013a1 am ebbcc18e: am 4032217e: Merge "Add option for video playback test to accept media source path." into jb-mr2-dev 
* commit 'ebbcc18eaa8a69579fadae484630aa1ba447c031':
  Add option for video playback test to accept media source path.
 2013-08-05 15:58:48 -07:00
Xia Wang
ebbcc18eaa am 4032217e: Merge "Add option for video playback test to accept media source path." into jb-mr2-dev 
* commit '4032217ee939d3b23548e83d9183306d66af6f8f':
  Add option for video playback test to accept media source path.
 2013-08-05 15:54:41 -07:00
Xia Wang
4032217ee9 Merge "Add option for video playback test to accept media source path." into jb-mr2-dev 2013-08-05 22:51:03 +00:00
Elliott Hughes
eab8e18d8f am 8a736129: Merge "If graphics wants ASCII lowercasing, it needs to ask for it." 
* commit '8a736129faa9e41b5f33c42bbeae1f68cb42d38f':
  If graphics wants ASCII lowercasing, it needs to ask for it.
 2013-08-05 11:07:13 -07:00
Elliott Hughes
8a736129fa Merge "If graphics wants ASCII lowercasing, it needs to ask for it." 2013-08-05 18:01:33 +00:00
Dianne Hackborn
c8911ddd48 am 373a2f15: am 607b414d: Add new app ops method to reset all op modes. 
* commit '373a2f15667956ff8a00ba59b42972b9c930af92':
  Add new app ops method to reset all op modes.
 2013-08-02 19:32:13 -07:00
Dianne Hackborn
373a2f1566 am 607b414d: Add new app ops method to reset all op modes. 
* commit '607b414d0444067e166fa54d8ea37563f2715ea3':
  Add new app ops method to reset all op modes.
 2013-08-02 19:30:08 -07:00
Dianne Hackborn
607b414d04 Add new app ops method to reset all op modes. 
Change-Id: I5ee6764de8dc31d812e5a788914ab0099bbef4c0
 2013-08-02 19:06:25 -07:00
Jean-Baptiste Queru
ae311f4c5f am 17548b3c: Revert "be more robust with handling unknown sensors" 
* commit '17548b3c70fe4f29d33367a61300f5323f5efe99':
  Revert "be more robust with handling unknown sensors"
 2013-08-02 17:42:02 -07:00
Jean-Baptiste Queru
d07347eddb am 83485dc9: Merge "be more robust with handling unknown sensors" 
* commit '83485dc920cdc4a6f3dd6797623f536c99f08a6c':
  be more robust with handling unknown sensors
 2013-08-02 17:41:59 -07:00
Elliott Hughes
710f3e2cc6 am 60ae2617: Merge "If frameworks wants ASCII casing, it should explicity ask for it." 
* commit '60ae2617b4b304fc3e45a441f87d1765714477ba':
  If frameworks wants ASCII casing, it should explicity ask for it.
 2013-08-02 17:41:57 -07:00
Elliott Hughes
b56f10aa66 am 32c308a5: Merge "If media wants ASCII lowercasing, it needs to ask for it." 
* commit '32c308a5f2051a62ab2fb3337d00d84e9035eb9a':
  If media wants ASCII lowercasing, it needs to ask for it.
 2013-08-02 17:41:54 -07:00
Dirk Dougherty
966dc871ca am 780795dc: am b6cb0437: Merge "Doc change: refresh GCM reference docs." into jb-mr2-docs 
* commit '780795dc198c05d5a1a181c58317dc6befec861d':
  Doc change: refresh GCM reference docs.
 2013-08-02 17:41:05 -07:00
Scott Main
24a32c98a5 am e0a85960: am 9a0087f2: Merge "docs: OpenGL Training sample code fixes" into jb-mr2-docs 
* commit 'e0a8596020a10c1cf6347d89fea862d41629db04':
  docs: OpenGL Training sample code fixes
 2013-08-02 17:41:02 -07:00
Dirk Dougherty
780795dc19 am b6cb0437: Merge "Doc change: refresh GCM reference docs." into jb-mr2-docs 
* commit 'b6cb0437ef0677aa4b58bb76a77dd4fdae8258e0':
  Doc change: refresh GCM reference docs.
 2013-08-02 17:38:31 -07:00
Scott Main
e0a8596020 am 9a0087f2: Merge "docs: OpenGL Training sample code fixes" into jb-mr2-docs 
* commit '9a0087f22754de40cd5be2a738600f9642a611cc':
  docs: OpenGL Training sample code fixes
 2013-08-02 17:38:28 -07:00
Jean-Baptiste Queru
17548b3c70 Revert "be more robust with handling unknown sensors" 
This reverts commit 80ba0a6baec17d5ac5a1e6f9e4b84f7d013d07e6.
 2013-08-02 17:31:54 -07:00
Jean-Baptiste Queru
83485dc920 Merge "be more robust with handling unknown sensors" 2013-08-03 00:13:24 +00:00
Dirk Dougherty
b6cb0437ef Merge "Doc change: refresh GCM reference docs." into jb-mr2-docs 2013-08-02 22:49:11 +00:00
Scott Main
9a0087f227 Merge "docs: OpenGL Training sample code fixes" into jb-mr2-docs 2013-08-02 22:27:14 +00:00
Elliott Hughes
60ae2617b4 Merge "If frameworks wants ASCII casing, it should explicity ask for it." 2013-08-02 22:13:07 +00:00
Elliott Hughes
cb64d43062 If frameworks wants ASCII casing, it should explicity ask for it. 
http://elliotth.blogspot.com/2012/01/beware-convenience-methods.html

Bug: https://code.google.com/p/android/issues/detail?id=58359
Change-Id: Iaab02e718a7be7bda22e626dca05d79bfd2a8fc4
 2013-08-02 15:12:32 -07:00
Scott Main
efd288a261 am 2a666620: am 1f196903: Merge "add note to use "480" instead of "xxhdpi" (this should be temporary)" into jb-mr2-docs 
* commit '2a6666207d0e0b7545cbd1f0a7f6754d5ca1587b':
  add note to use "480" instead of "xxhdpi" (this should be temporary)
 2013-08-02 14:29:09 -07:00
Scott Main
2a6666207d am 1f196903: Merge "add note to use "480" instead of "xxhdpi" (this should be temporary)" into jb-mr2-docs 
* commit '1f19690322523d5a28051c55353735513638ca39':
  add note to use "480" instead of "xxhdpi" (this should be temporary)
 2013-08-02 14:27:40 -07:00
Scott Main
1f19690322 Merge "add note to use "480" instead of "xxhdpi" (this should be temporary)" into jb-mr2-docs 2013-08-02 21:23:55 +00:00
Joe Fernandez
ab1f29d935 docs: OpenGL Training sample code fixes 
Change-Id: Ifc757a2cb55781d5c42f9256cb698aa5a3a54bb8
(cherry picked from commit 6da22f88434543e8796e0151f4bb11d74c16e847)
 2013-08-02 20:57:03 +00:00
Mathias Agopian
80ba0a6bae be more robust with handling unknown sensors 
- add support for new sensors (post 4.3)
- don't crash when encountering an unknown sensor type
- clean-up

Bug: 9683153
Change-Id: Iecd883e8a7d0297be1bd2bd4f00c5cc3ffcbccfe
 2013-08-02 13:49:41 -07:00
Dave Burke
0eab98dd24 am 019f4385: am 7925e7cc: Merge "Revert "Add version identifier to app ops."" into jb-mr2-dev 
* commit '019f4385d17234324db23521149e1f1cb6d7d061':
  Revert "Add version identifier to app ops."
 2013-08-02 13:42:03 -07:00
Dave Burke
019f4385d1 am 7925e7cc: Merge "Revert "Add version identifier to app ops."" into jb-mr2-dev 
* commit '7925e7cc089251afb2faceb3e81eea436647c572':
  Revert "Add version identifier to app ops."
 2013-08-02 13:39:12 -07:00
Dave Burke
7925e7cc08 Merge "Revert "Add version identifier to app ops."" into jb-mr2-dev 2013-08-02 20:36:28 +00:00
Dave Burke
0997c5bd79 Revert "Add version identifier to app ops." 
This reverts commit 483a6bbfc118409b9c46b226cf0aa6afdc4d9159.

Change-Id: I91d6b8b8d1789089bf9764e734f7fe59d03151a2
 2013-08-02 20:25:02 +00:00
Scott Main
d53f8abcf5 add note to use "480" instead of "xxhdpi" (this should be temporary) 
Change-Id: I6552f1cc420d3278f363df8e0640d59eba1fd180
 2013-08-02 12:56:43 -07:00
Elliott Hughes
32c308a5f2 Merge "If media wants ASCII lowercasing, it needs to ask for it." 2013-08-02 17:24:41 +00:00
Elliott Hughes
dcb1a58cf9 If media wants ASCII lowercasing, it needs to ask for it. 
http://elliotth.blogspot.com/2012/01/beware-convenience-methods.html

Use toLowerCase(Locale.ROOT) if you want ASCII for machine consumption,
and use toLowerCase(Locale.getDefault()) if you want the user's locale's
casing rules for human consumption.

Bug: https://code.google.com/p/android/issues/detail?id=58359
Change-Id: Id9005a17e34217a81bef3b40031b9e2e6272f45d
 2013-08-02 10:03:53 -07:00
Elliott Hughes
5d6b7db5d9 am 20c911ba: Merge "When wifi wants ASCII lowercasing, it needs to ask for it." 
* commit '20c911ba071957ff5907d9a7854e7eab1cdaf907':
  When wifi wants ASCII lowercasing, it needs to ask for it.
 2013-08-02 09:46:04 -07:00
Elliott Hughes
20c911ba07 Merge "When wifi wants ASCII lowercasing, it needs to ask for it." 2013-08-02 16:39:59 +00:00
Elliott Hughes
aeb60fb86f If graphics wants ASCII lowercasing, it needs to ask for it. 
http://elliotth.blogspot.com/2012/01/beware-convenience-methods.html

Bug: https://code.google.com/p/android/issues/detail?id=58359
Change-Id: I13c106985302335dbb15bb9176d35ec6b4546d4e
 2013-08-02 09:31:11 -07:00
Elliott Hughes
ee00b353a4 When wifi wants ASCII lowercasing, it needs to ask for it. 
http://elliotth.blogspot.com/2012/01/beware-convenience-methods.html

Bug: https://code.google.com/p/android/issues/detail?id=58359
Change-Id: Ibf25d0bbc76015cf8353ec01ab2b743cbc2bde67
 2013-08-02 09:07:54 -07:00
Naveen Kalla
b4d485c184 Set subscription_mode in the database to a default value 
If ro.telephony.default_cdma_sub is set, use that to set the
default CDMA subscription source in the database. If that is not set
use the default preferred value defined in the source code.

Change-Id: I11fff596a5fe721c64f192c889672326517dc43d
 2013-08-01 18:03:42 -07:00
Dirk Dougherty
882ecced5e Doc change: refresh GCM reference docs. 
Change-Id: I4f79e27b9d761cb8967fb90ff8df5438e43cd39c
 2013-08-01 16:15:21 -07:00
Scott Main
a5da186523 am 9210aea5: am 218120e0: Merge "dashboard update for 8/1" into jb-mr2-docs 
* commit '9210aea5accb872527ba1d54ba0760340ad8f1ba':
  dashboard update for 8/1
 2013-08-01 15:58:53 -07:00
Scott Main
9210aea5ac am 218120e0: Merge "dashboard update for 8/1" into jb-mr2-docs 
* commit '218120e0795bc4aee1b29a43da25a8ea7e8edf71':
  dashboard update for 8/1
 2013-08-01 15:57:08 -07:00
Scott Main
218120e079 Merge "dashboard update for 8/1" into jb-mr2-docs 2013-08-01 22:54:06 +00:00
Scott Main
bf03f391ba dashboard update for 8/1 
Change-Id: I8541646e13d20186f79dd8a548b1ff21602793b6
 2013-08-01 15:49:20 -07:00
Scott Main
54403d8a27 am f5ad5b26: am 8709fb2a: Merge "update Getting Started class about fragments to remove support lib lesson and mention the action bar library, then update any links and add redirect bug: 10000221" into jb-mr2-docs 
* commit 'f5ad5b2635d0a46c9a3e09543431a73e915ba4c6':
  update Getting Started class about fragments to remove support lib lesson and mention the action bar library, then update any links and add redirect bug: 10000221
 2013-08-01 15:42:54 -07:00