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

113139 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yuhao Zheng
b1bf5f6132 am 41c55361: am e91a3f52: Merge "Add a hidden API to toggle airplane mode." into klp-dev 
* commit '41c55361d1a68d5d41cc2ff5b1b486b0ed0109fc':
  Add a hidden API to toggle airplane mode.
 2013-09-10 10:16:50 -07:00
Yuhao Zheng
41c55361d1 am e91a3f52: Merge "Add a hidden API to toggle airplane mode." into klp-dev 
* commit 'e91a3f5229405b39a3ba59aa0a3e44527eef063e':
  Add a hidden API to toggle airplane mode.
 2013-09-10 10:13:22 -07:00
Martijn Coenen
468b6e753f am 6343075f: am 9720d5e1: Merge "Remove legacy HCE APIs." into klp-dev 
* commit '6343075fbf1fef40d421d060b807e8cbc08849cf':
  Remove legacy HCE APIs.
 2013-09-10 10:13:14 -07:00
Yuhao Zheng
e91a3f5229 Merge "Add a hidden API to toggle airplane mode." into klp-dev 2013-09-10 17:12:00 +00:00
Martijn Coenen
6343075fbf am 9720d5e1: Merge "Remove legacy HCE APIs." into klp-dev 
* commit '9720d5e11c5175503b383bd903c68d2408d2bb80':
  Remove legacy HCE APIs.
 2013-09-10 10:07:38 -07:00
Martijn Coenen
9720d5e11c Merge "Remove legacy HCE APIs." into klp-dev 2013-09-10 17:04:32 +00:00
Yuhao Zheng
5cd1a0e8d7 Add a hidden API to toggle airplane mode. 
Added a hidden API under ConnectivityManager to toggle airplane mode.
This may be a temp solution for b/10653570.
bug:10653570

Change-Id: I0b2b42230073289eb8dc6891317d62b84e26c133
 2013-09-10 09:57:12 -07:00
Glenn Kasten
83fa7d08c5 am 10779b12: am d9f4e0cf: Merge "AudioTrack.getTimestamp() return type is now boolean" into klp-dev 
* commit '10779b12eec870f428345d192f200dd0a7ad40bc':
  AudioTrack.getTimestamp() return type is now boolean
 2013-09-10 09:42:15 -07:00
Glenn Kasten
10779b12ee am d9f4e0cf: Merge "AudioTrack.getTimestamp() return type is now boolean" into klp-dev 
* commit 'd9f4e0cf2c2466d9e05f8562e55d342934f7ed0d':
  AudioTrack.getTimestamp() return type is now boolean
 2013-09-10 09:39:18 -07:00
Glenn Kasten
d9f4e0cf2c Merge "AudioTrack.getTimestamp() return type is now boolean" into klp-dev 2013-09-10 16:36:23 +00:00
John Reck
4669a5d278 am 8eb3ece8: am 1d2daa78: Merge "Remove FD optimization case for decodeStream" into klp-dev 
* commit '8eb3ece8eeaea4dc06c5b3854d8fd9efea4ef5fc':
  Remove FD optimization case for decodeStream
 2013-09-10 09:31:04 -07:00
John Reck
8eb3ece8ee am 1d2daa78: Merge "Remove FD optimization case for decodeStream" into klp-dev 
* commit '1d2daa7809b58c226410c0060d7837de0a29888a':
  Remove FD optimization case for decodeStream
 2013-09-10 09:29:12 -07:00
John Reck
1d2daa7809 Merge "Remove FD optimization case for decodeStream" into klp-dev 2013-09-10 16:25:14 +00:00
Marco Nelissen
bbfdb779d5 am 488e925f: am 8716c081: Merge "Use correct timescale for "date taken" field" into klp-dev 
* commit '488e925ff96e661e3d61e85939f7bda26a319c1d':
  Use correct timescale for "date taken" field
 2013-09-10 09:14:56 -07:00
Marco Nelissen
488e925ff9 am 8716c081: Merge "Use correct timescale for "date taken" field" into klp-dev 
* commit '8716c08151378f7488a0f129fe43a0b3d4dc499d':
  Use correct timescale for "date taken" field
 2013-09-10 09:12:05 -07:00
Marco Nelissen
8716c08151 Merge "Use correct timescale for "date taken" field" into klp-dev 2013-09-10 16:09:16 +00:00
Amith Yamasani
a927fb6169 am 23d6b7b3: am 618f8cc5: Merge "Don\'t leave space for summary text if it\'s an empty string" into klp-dev 
* commit '23d6b7b36096eef53f819ee5eee0aba3beecde67':
  Don't leave space for summary text if it's an empty string
 2013-09-10 09:02:43 -07:00
Amith Yamasani
23d6b7b360 am 618f8cc5: Merge "Don\'t leave space for summary text if it\'s an empty string" into klp-dev 
* commit '618f8cc5dbb6dff03ad3270d6b948b1ef90c5dd6':
  Don't leave space for summary text if it's an empty string
 2013-09-10 09:01:09 -07:00
Amith Yamasani
618f8cc5db Merge "Don't leave space for summary text if it's an empty string" into klp-dev 2013-09-10 15:59:37 +00:00
Stephen Hines
319cc55c02 am 9b448989: am e3d0f022: Merge "Don\'t set Allocation mSize when we have no Type." into klp-dev 
* commit '9b4489897974db2a7a6d9e19b4de2817bbb4755a':
  Don't set Allocation mSize when we have no Type.
 2013-09-09 22:26:58 -07:00
Stephen Hines
9b44898979 am e3d0f022: Merge "Don\'t set Allocation mSize when we have no Type." into klp-dev 
* commit 'e3d0f022826a2a16e64dc9b5353a2a514393881b':
  Don't set Allocation mSize when we have no Type.
 2013-09-09 22:25:22 -07:00
Stephen Hines
e3d0f02282 Merge "Don't set Allocation mSize when we have no Type." into klp-dev 2013-09-10 05:23:15 +00:00
Baligh Uddin
7da4d0c57a am 85454403: (-s ours) am 5f5e8477: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '85454403584f5b9625b75fb6770271ee74910552':
  Import translations. DO NOT MERGE
 2013-09-09 22:09:01 -07:00
Baligh Uddin
8545440358 am 5f5e8477: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '5f5e84770badd10c41fd4a2b01a9958a607eacd9':
  Import translations. DO NOT MERGE
 2013-09-09 22:06:26 -07:00
Baligh Uddin
ab2461477b am ad53a540: (-s ours) am a244732d: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'ad53a540ede9f006a97a8dceda3e0119d2029fb1':
  Import translations. DO NOT MERGE
 2013-09-09 22:05:29 -07:00
Baligh Uddin
ad53a540ed am a244732d: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'a244732d93c09da1db9fd79b6e7275649a18c60b':
  Import translations. DO NOT MERGE
 2013-09-09 22:02:58 -07:00
Baligh Uddin
2a5a7b0548 Merge "Import translations. DO NOT MERGE" 2013-09-10 05:01:02 +00:00
Baligh Uddin
5f5e84770b Merge "Import translations. DO NOT MERGE" into klp-dev 2013-09-10 05:00:52 +00:00
Baligh Uddin
3780d54e3c Merge "Import translations. DO NOT MERGE" 2013-09-10 04:58:25 +00:00
Baligh Uddin
a244732d93 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-09-10 04:58:04 +00:00
Baligh Uddin
2603c2b934 Merge "Import translations. DO NOT MERGE" 2013-09-10 04:57:54 +00:00
Jeff Sharkey
9a60acd77c am 7b69c566: am 9e2c661b: Merge "Fix getCallingPackage() to handle reentrance." into klp-dev 
* commit '7b69c566fd1cb1242e805462fdb6ceb6d9bef0a7':
  Fix getCallingPackage() to handle reentrance.
 2013-09-09 21:48:46 -07:00
Jeff Sharkey
7b69c566fd am 9e2c661b: Merge "Fix getCallingPackage() to handle reentrance." into klp-dev 
* commit '9e2c661b3ba26fa8de1299608e27aa95e124a413':
  Fix getCallingPackage() to handle reentrance.
 2013-09-09 21:46:18 -07:00
Jeff Sharkey
d04e0c0adb am 78bb372f: am af927234: Merge changes I7b3f4c68,I9f022a08 into klp-dev 
* commit '78bb372fb70b7c383ae4ab158734666de9ce8e95':
  Rename offer() to add(), remove/hide some APIs.
  Sort order is sticky for session, back leaves.
 2013-09-09 21:45:11 -07:00
Jeff Sharkey
78bb372fb7 am af927234: Merge changes I7b3f4c68,I9f022a08 into klp-dev 
* commit 'af9272349fb9eed1653d5af0768c9517e36070a6':
  Rename offer() to add(), remove/hide some APIs.
  Sort order is sticky for session, back leaves.
 2013-09-09 21:42:50 -07:00
Jeff Sharkey
9e2c661b3b Merge "Fix getCallingPackage() to handle reentrance." into klp-dev 2013-09-10 04:41:53 +00:00
Jeff Sharkey
af9272349f Merge changes I7b3f4c68,I9f022a08 into klp-dev 
* changes:
  Rename offer() to add(), remove/hide some APIs.
  Sort order is sticky for session, back leaves.
 2013-09-10 04:40:41 +00:00
Jeff Brown
e995af44a7 am 404c4855: am 392c76b1: Merge "Clarify InputDevice#getControllerNumber documentation" into klp-dev 
* commit '404c4855ab0f85bd5ccccf0d3e443819bad6762a':
  Clarify InputDevice#getControllerNumber documentation
 2013-09-09 20:40:09 -07:00
Jeff Brown
404c4855ab am 392c76b1: Merge "Clarify InputDevice#getControllerNumber documentation" into klp-dev 
* commit '392c76b1f6bc756359a70263c1708682f884027a':
  Clarify InputDevice#getControllerNumber documentation
 2013-09-09 20:37:52 -07:00
Jeff Brown
392c76b1f6 Merge "Clarify InputDevice#getControllerNumber documentation" into klp-dev 2013-09-10 03:35:55 +00:00
Sandeep Siddhartha
b53786d913 am 37b7632a: am bc916b22: Fix checkbuild error due to javadoc reference to hidden class 
* commit '37b7632add23aedd489b1468d39973821609303c':
  Fix checkbuild error due to javadoc reference to hidden class
 2013-09-09 19:31:25 -07:00
Sandeep Siddhartha
37b7632add am bc916b22: Fix checkbuild error due to javadoc reference to hidden class 
* commit 'bc916b221a344d0d2f8f6353c5162f9a6d61eb8b':
  Fix checkbuild error due to javadoc reference to hidden class
 2013-09-09 19:30:09 -07:00
Sandeep Siddhartha
bc916b221a Fix checkbuild error due to javadoc reference to hidden class 
Change-Id: I128b8a6dd725468d0c9503b8229f8939fddb51bc
 2013-09-10 02:17:20 +00:00
Alan Viverette
5b73e36507 Merge "Add View constructor that supplies a default style resource" 2013-09-10 02:04:22 +00:00
Jeff Sharkey
72e2e3577b Fix getCallingPackage() to handle reentrance. 
Keep any previous value in the stack frame and restore when the
current call is finished.

Bug: 10659409
Change-Id: I02b760ae9ca06a4b3602725e02f649f1ada460a0
 2013-09-09 18:52:48 -07:00
Xia Wang
20d3923280 am 9d5182f9: am 11f2b42d: Remove system user id for cm tests 
* commit '9d5182f9db9a0bdff8700006bc6b84906a842c8e':
  Remove system user id for cm tests
 2013-09-09 18:18:34 -07:00
Xia Wang
9d5182f9db am 11f2b42d: Remove system user id for cm tests 
* commit '11f2b42d8c185ac91db07a539605cba7ecd28e6a':
  Remove system user id for cm tests
 2013-09-09 18:15:59 -07:00
Alan Viverette
617feb99a0 Add View constructor that supplies a default style resource 
Also updates the constructor of every class that extends View.

BUG: 10676369
Change-Id: Ifaf27bf82028d180afa4931c0e906df88d858ac3
 2013-09-09 18:09:13 -07:00
Xia Wang
11f2b42d8c Remove system user id for cm tests 
Change-Id: I51f500c8e7b4e2963093e20c6f20bcfe020995c9
(cherry picked from commit 575495c29007503566e28004bf60018a824b1f1b)
 2013-09-10 01:07:33 +00:00
Stephen Hines
88990da58d Don't set Allocation mSize when we have no Type. 
Bug: 10667740

A3D creates Allocations before knowing the underlying Type (and thus size).
Moving the mSize calculation to be conditional for concrete Allocations
eliminates the bug. In the future, we could let A3D dynamically update the
Allocation size if it is necessary to improve heap behavior.

Change-Id: I520246806b6ead0387a1a41372dade1a6e7c2271
 2013-09-09 17:56:07 -07:00