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

160938 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Quddus Chong
8c4f85c31c am e5856e6b: am c63471ad: am 51aa424a: am 9b278f56: Merge "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 
automerge: a0c9b53

* commit 'a0c9b538caac4cf4eec06abaa99ea3f28ec7163f':
  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 18:31:31 +00:00
Quddus Chong
fdd7dd0e91 am 48612f9d: am 5192ac8d: am f990241a: am abde3d83: Merge "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785." into lmp-docs 
automerge: 3367fd2

* commit '3367fd2aaee750d200e0683ca45b62a455c2e1e9':
  docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.
 2015-03-19 18:31:21 +00:00
Andrew Solovay
f8e299945a am b08f2078: am 3f7f78c6: am 27853819: am 78bbfe04: Merge "docs: Removed sentence fragments." into lmp-docs 
automerge: 3852906

* commit '385290601489f63e413b7d021d117f175174ee65':
  docs: Removed sentence fragments.
 2015-03-19 18:31:08 +00:00
Andrew Solovay
c6aa4ac71f am cf34a6d1: am 46bda6a4: am 6fd36f11: am ae279bd5: Merge "docs: Fixed typo (spurious quotation mark)." into lmp-docs 
automerge: 7a98f83

* commit '7a98f832dc01671b8acc128b01ea87c20595f781':
  docs: Fixed typo (spurious quotation mark).
 2015-03-19 18:30:59 +00:00
Andrew Solovay
3a49421c16 am a0141748: am 42f966c9: am dbec5ae6: am 0aef0abf: Merge "docs: Fixed broken image link, and broke long lines in code samples" into lmp-docs 
automerge: 8973063

* commit '89730636985c745055671f077514963744e1aeb8':
  docs: Fixed broken image link, and broke long lines in code samples
 2015-03-19 18:30:43 +00:00
Jan Nordqvist
3105289af3 Merge "More fixes to get passpoint working" into m-wireless-dev 2015-03-19 17:09:10 +00:00
John Reck
6c6fab231b Merge "Fix setSurfaceTexture to handle surface caching" into m-wireless-dev 2015-03-19 14:31:19 +00:00
Paul Jensen
36e348863d Merge "Remove dead code, mostly DataStateTracker." into m-wireless-dev 2015-03-19 12:07:24 +00:00
Wei Wang
986a97e20a Merge "Make Opportunistic Scan API public." into m-wireless-dev 2015-03-19 05:02:09 +00:00
Bart Sears
1418624714 am c2eb5c60: Merge "Prevent activities from being started during setup wizard." into lmp-mr1-dev 
automerge: dd985c2

* commit 'dd985c21dd4f5957e8d6e052976623d127e8f090':
  Prevent activities from being started during setup wizard.
 2015-03-19 02:58:59 +00:00
Dan Sandler
a14b2c42b2 am b3a1b663: Merge "Avoid crashing on corrupted notifications." into lmp-mr1-dev 
automerge: 1ac28e1

* commit '1ac28e18b417b286f05a44712acb1d5f00b56fb3':
  Avoid crashing on corrupted notifications.
 2015-03-19 02:58:41 +00:00
Rich Slogar
03f5584ac0 am 8d3f587f: am 57c24fbb: am 2fc33a00: am ddc44153: docs: downloads for sdk 24.1.2 
automerge: 455b64c

* commit '455b64c57f06bace3f85dce1a30064bd66dd2385':
  docs: downloads for sdk 24.1.2
 2015-03-19 02:58:33 +00:00
Pierre Vandwalle
af3f1c995c Merge "export API to disable autojoin scan initial implementation" into lmp-mr1-wfc-dev 
automerge: 7c39808

* commit '7c398083319bbd1ad51d23cb307cfc3ac9091c3a':
  export API to disable autojoin scan initial implementation
 2015-03-19 02:58:01 +00:00
Quddus Chong
a0c9b538ca am e5856e6b: am c63471ad: am 51aa424a: am 9b278f56: Merge "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 'e5856e6b2ce1cb6a4c15d1ae5ee786ac1ec2012b':
  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 02:51:44 +00:00
Quddus Chong
3367fd2aae am 48612f9d: am 5192ac8d: am f990241a: am abde3d83: Merge "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785." into lmp-docs 
* commit '48612f9d4b1699483b22226096d0dbeb1cb23817':
  docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.
 2015-03-19 02:51:38 +00:00
Quddus Chong
e5856e6b2c am c63471ad: am 51aa424a: am 9b278f56: Merge "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 'c63471ade6a136259f1bdc88beb5f10268f26cb0':
  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 02:36:56 +00:00
Quddus Chong
48612f9d4b am 5192ac8d: am f990241a: am abde3d83: Merge "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785." into lmp-docs 
* commit '5192ac8d0652e0b0fc442325af393d34d30dfba7':
  docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.
 2015-03-19 02:36:50 +00:00
Andrew Solovay
3852906014 am b08f2078: am 3f7f78c6: am 27853819: am 78bbfe04: Merge "docs: Removed sentence fragments." into lmp-docs 
* commit 'b08f20787c793c79d2031a34824dbfa5be4a602c':
  docs: Removed sentence fragments.
 2015-03-19 01:17:26 +00:00
Andrew Solovay
7a98f832dc am cf34a6d1: am 46bda6a4: am 6fd36f11: am ae279bd5: Merge "docs: Fixed typo (spurious quotation mark)." into lmp-docs 
* commit 'cf34a6d1a19853fe156bf14abcb40a01a380de79':
  docs: Fixed typo (spurious quotation mark).
 2015-03-19 01:17:17 +00:00
Andrew Solovay
8973063698 am a0141748: am 42f966c9: am dbec5ae6: am 0aef0abf: Merge "docs: Fixed broken image link, and broke long lines in code samples" into lmp-docs 
* commit 'a01417485279a486df31f8666b037b6f15d7f935':
  docs: Fixed broken image link, and broke long lines in code samples
 2015-03-19 01:17:11 +00:00
Andrew Solovay
b08f20787c am 3f7f78c6: am 27853819: am 78bbfe04: Merge "docs: Removed sentence fragments." into lmp-docs 
* commit '3f7f78c6518f93b694bd868d406c755e2469584c':
  docs: Removed sentence fragments.
 2015-03-19 00:55:12 +00:00
Andrew Solovay
cf34a6d1a1 am 46bda6a4: am 6fd36f11: am ae279bd5: Merge "docs: Fixed typo (spurious quotation mark)." into lmp-docs 
* commit '46bda6a4838e592fd3cc0d9334ae92cdc7434f3e':
  docs: Fixed typo (spurious quotation mark).
 2015-03-19 00:55:08 +00:00
Andrew Solovay
a014174852 am 42f966c9: am dbec5ae6: am 0aef0abf: Merge "docs: Fixed broken image link, and broke long lines in code samples" into lmp-docs 
* commit '42f966c9df6ed4e7903e87ad557d63ed81da2986':
  docs: Fixed broken image link, and broke long lines in code samples
 2015-03-19 00:55:01 +00:00
Vinit Deshpande
ad25bb8925 More fixes to get passpoint working 
Change-Id: If8639bb0fd3bdaad7ee09217a9152c1695cb9354
 2015-03-18 17:00:48 -07:00
Quddus Chong
c63471ade6 am 51aa424a: am 9b278f56: Merge "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 '51aa424aa1d69af9b91b5f834d1acb30e99df7b1':
  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-18 23:43:27 +00:00
Quddus Chong
5192ac8d06 am f990241a: am abde3d83: Merge "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785." into lmp-docs 
* commit 'f990241a74c9f885f249a78e98c8cd6b083ff1d7':
  docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.
 2015-03-18 23:43:22 +00:00
Wei Wang
e1d0f58aa8 Make Opportunistic Scan API public. 
Change-Id: I47da0f7e385f0a72815e493852283a44370aa1ce
 2015-03-18 16:38:08 -07:00
Quddus Chong
51aa424aa1 am 9b278f56: Merge "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 '9b278f5615966f1d642f2503759f6618292058bb':
  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-18 23:37:09 +00:00
Quddus Chong
f990241a74 am abde3d83: Merge "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785." into lmp-docs 
* commit 'abde3d83f86af44e2beedc2fc10bfc23a405a5d9':
  docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.
 2015-03-18 23:37:03 +00:00
Quddus Chong
9b278f5615 Merge "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 2015-03-18 23:29:57 +00:00
Quddus Chong
abde3d83f8 Merge "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785." into lmp-docs 2015-03-18 23:29:44 +00:00
Quddus Chong
b2a6185e25 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. 
Change-Id: I4154c04a3a64fce1ec314a40237ab4c5472d651c
 2015-03-18 16:11:23 -07:00
Naveen Kalla
fd69e2a258 Fix setSurfaceTexture to handle surface caching 
TextureView contains its surfaceTexture (i.e. mSurface)
and its OnFrameAvailableListener(i.e. mUpdateListener).
In order to apply a cached/pre-existing SurfaceTexture s1 to a
TextureView, if we call TextureView.setSurfaceTexture(s1),
the OnFrameAvailableListener of s1 should get set to mUpdateListener
of TextureView since the mSurface has been updated.
The existing code doesn't apply this and causes the frames to not be
updated on a TextureView that uses setSurfaceTexture.
This change fixes setSurfaceTexture method by setting s1's
OnFrameAvailableListener to mUpdateListener.

Change-Id: I4c1a704c587e977ab7a6b1fe3a7d3e0d20d00218
 2015-03-18 15:57:10 -07:00
Pierre Vandwalle
2877877d4c add BASE_WIFI_LOGGER to system protocol messages 
Change-Id: I4bb59b220208d5cb4fa415ad092970312392d8e4
 2015-03-18 15:51:06 -07:00
Andrew Solovay
3f7f78c651 am 27853819: am 78bbfe04: Merge "docs: Removed sentence fragments." into lmp-docs 
* commit '278538193c2eb68d13c3f8a741ab6c2274feb266':
  docs: Removed sentence fragments.
 2015-03-18 22:44:32 +00:00
Andrew Solovay
46bda6a483 am 6fd36f11: am ae279bd5: Merge "docs: Fixed typo (spurious quotation mark)." into lmp-docs 
* commit '6fd36f11bee008dae92ed312e4a8291417e6e93f':
  docs: Fixed typo (spurious quotation mark).
 2015-03-18 22:44:24 +00:00
Andrew Solovay
42f966c9df am dbec5ae6: am 0aef0abf: Merge "docs: Fixed broken image link, and broke long lines in code samples" into lmp-docs 
* commit 'dbec5ae69a8bcf10cfd6d483356d0fb904b73290':
  docs: Fixed broken image link, and broke long lines in code samples
 2015-03-18 22:44:09 +00:00
Andrew Solovay
278538193c am 78bbfe04: Merge "docs: Removed sentence fragments." into lmp-docs 
* commit '78bbfe049c5e7a0c2f7ac8fe39f45b11d9099a55':
  docs: Removed sentence fragments.
 2015-03-18 22:35:59 +00:00
Andrew Solovay
6fd36f11be am ae279bd5: Merge "docs: Fixed typo (spurious quotation mark)." into lmp-docs 
* commit 'ae279bd5b03f472d4bd1427365009269db9fe5e3':
  docs: Fixed typo (spurious quotation mark).
 2015-03-18 22:35:49 +00:00
Andrew Solovay
dbec5ae69a am 0aef0abf: Merge "docs: Fixed broken image link, and broke long lines in code samples" into lmp-docs 
* commit '0aef0abf3d3366c09a89d3132ff2ce5979988fc1':
  docs: Fixed broken image link, and broke long lines in code samples
 2015-03-18 22:35:45 +00:00
Andrew Solovay
78bbfe049c Merge "docs: Removed sentence fragments." into lmp-docs 2015-03-18 22:27:08 +00:00
xinhe
9954faa70d Change rtt Framework interface 
Bug:19735392
Change-Id: I0886d3c0e40a6dd5477c81a5df5dbc2746942ec3
 2015-03-18 22:26:48 +00:00
Andrew Solovay
ae279bd5b0 Merge "docs: Fixed typo (spurious quotation mark)." into lmp-docs 2015-03-18 22:26:05 +00:00
Andrew Solovay
0aef0abf3d Merge "docs: Fixed broken image link, and broke long lines in code samples" into lmp-docs 2015-03-18 22:23:13 +00:00
Bart Sears
dd985c21dd am c2eb5c60: Merge "Prevent activities from being started during setup wizard." into lmp-mr1-dev 
* commit 'c2eb5c602d36d91483c8f24b0c6859e4283724b4':
  Prevent activities from being started during setup wizard.
 2015-03-18 20:30:15 +00:00
Bart Sears
c2eb5c602d Merge "Prevent activities from being started during setup wizard." into lmp-mr1-dev 2015-03-18 20:22:36 +00:00
Tyler Gunn
d11a31561e resolve merge conflicts of bcb17eb to m-wireless-dev. 
Change-Id: Ic8211fb14caec993c8e38c790006577493f7a607
 2015-03-18 13:09:14 -07:00
Brian Carlstrom
f9296808e9 am 97f3cd0a: Merge "Update vmSafeMode documentation" into lmp-mr1-dev 
automerge: 6a6cf63

* commit '6a6cf634f527cdde9382e8fabb4de5aaad748879':
  Update vmSafeMode documentation
 2015-03-18 19:08:26 +00:00
Pavel Zhamaitsiak
c24a5ad099 Merge "Add format string for displaying SPN in Wi-Fi calling mode." into lmp-mr1-wfc-dev 
automerge: 1d33a37

* commit '1d33a37e0591b27386db2d324313e601cef42527':
  Add format string for displaying SPN in Wi-Fi calling mode.
 2015-03-18 19:08:18 +00:00
Deepanshu Gupta
8c4e96f62e am 1f9a26af: am 158c08bc: am ada85905: Fix AppCompat action bar theming. 
automerge: 579535a

* commit '579535acfa1c5c093b5152cf6f20603b273137be':
  Fix AppCompat action bar theming.
 2015-03-18 19:08:09 +00:00