46494 Commits

Author SHA1 Message Date
Etienne Le Grand
acf395fd94 am 819239e5: Revert "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor"
* commit '819239e5bec90ee3c861ac45fffac4a832a183a1':
  Revert "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor"
2014-04-05 09:05:50 +00:00
Etienne Le Grand
819239e5be Revert "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor"
This reverts commit fd53d8352a4617941b0a0449390aa562a01ea1d3.

Change-Id: I1c6322d1d992147bb5ef201238374966128c1a61
2014-04-05 04:47:14 +00:00
Etienne Le Grand
bdfe384106 am fd53d835: Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor
* commit 'fd53d8352a4617941b0a0449390aa562a01ea1d3':
  Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor
2014-04-05 01:52:27 +00:00
Nick Kralevich
8e2a4b5395 am 4ed27328: am dc97144b: Merge "Always call super.onCreate(). Always."
* commit '4ed27328b5e20d32b1e6ac5b39684dad3e737ca7':
  Always call super.onCreate().  Always.
2014-04-04 23:31:44 +00:00
Etienne Le Grand
fd53d8352a Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor
Change-Id: I16e5da68f860494e24cca64075be76fad02617bc
2014-04-04 16:31:08 -07:00
Christopher Tate
5eab368c4d Always call super.onCreate(). Always.
Bug 12991134

(cherrypick of commit 9d6376a1d88ab5b3a41ee4400e3aaa4c4ee69e2a)

Change-Id: Ife16ef93408253e3318a06dc0206ab4b88c7f367
2014-04-04 23:06:13 +00:00
John Spurlock
642421aa7f am 5c31e487: Merge "Introduce new UI_MODE_TYPE_WATCH and qualifier." into klp-modular-dev
* commit '5c31e487c4577e1c47ee7c949325d6a13f0d462e':
  Introduce new UI_MODE_TYPE_WATCH and qualifier.
2014-04-04 19:28:09 +00:00
John Spurlock
5c31e487c4 Merge "Introduce new UI_MODE_TYPE_WATCH and qualifier." into klp-modular-dev 2014-04-04 19:24:09 +00:00
John Spurlock
6c191299a7 Introduce new UI_MODE_TYPE_WATCH and qualifier.
Default ui mode to watch if we have FEATURE_WATCH.

Bug:13395758
Change-Id: Ie5ff95de60e69e91ad3612c7d2f1fca7f49061bd
2014-04-04 15:21:53 -04:00
Ricardo Cervera
8f81d29558 am d10b6543: am 5df82523: am ff3d89c0: Merge "docs: Added permissions note for Context.getFilesDir. Bug: 13716053" into klp-docs
* commit 'd10b65431547d66b41e4e282e9261453bb0658ff':
  docs: Added permissions note for Context.getFilesDir. Bug: 13716053
2014-04-04 17:48:51 +00:00
Ricardo Cervera
d10b654315 am 5df82523: am ff3d89c0: Merge "docs: Added permissions note for Context.getFilesDir. Bug: 13716053" into klp-docs
* commit '5df825237afd016c48dd3577d839825e5161d3e7':
  docs: Added permissions note for Context.getFilesDir. Bug: 13716053
2014-04-04 17:42:44 +00:00
Ricardo Cervera
5df825237a am ff3d89c0: Merge "docs: Added permissions note for Context.getFilesDir. Bug: 13716053" into klp-docs
* commit 'ff3d89c08cd69c506ea07fb30a58f88e188b2dd9':
  docs: Added permissions note for Context.getFilesDir. Bug: 13716053
2014-04-04 17:38:59 +00:00
Ricardo Cervera
90a5f9851a docs: Added permissions note for Context.getFilesDir. Bug: 13716053
Change-Id: I02e17c358630ab298bb99731723405cdeae701fc
2014-04-04 10:26:05 -07:00
Raph Levien
c333381b4c am 24a2f20f: am c420ce34: Merge "Marquee text RTL improvements"
* commit '24a2f20fe64e893e28dc70b288e12567ff71019f':
  Marquee text RTL improvements
2014-04-03 16:02:39 +00:00
Raph Levien
c420ce34ba Merge "Marquee text RTL improvements" 2014-04-03 15:50:29 +00:00
Narayan Kamath
71ae2bd42b am f87b3a25: am 374db6c3: Merge "Remove ProcessState::mArgc,mArgV,mArgLen"
* commit 'f87b3a25b928f145558f6f60183944f513878b63':
  Remove ProcessState::mArgc,mArgV,mArgLen
2014-04-03 14:11:34 +00:00
Narayan Kamath
a23fcd7be8 Remove ProcessState::mArgc,mArgV,mArgLen
These look like historical oddities, and weren't really being
used for anything useful.

Process:setArgV0 was being called by android.util.Process, but
that functionality can be moved directly into the implementation
of that class.

bug: 13647418

Change-Id: I216c8f8a4c065f0cf3a61f19f9e32decd26f93f6
2014-04-03 12:29:07 +00:00
Ben Murdoch
55da62288d am 14424043: am 369a0057: Merge "Update ViewRootImpl for 64bit functor type."
* commit '14424043b9c20edf639004e05fe8e9264a2e66f5':
  Update ViewRootImpl for 64bit functor type.
2014-04-03 10:00:25 +00:00
Ben Murdoch
369a00574d Merge "Update ViewRootImpl for 64bit functor type." 2014-04-03 09:48:43 +00:00
Jeff Brown
c2cebee67a am 8db6d9af: Merge "Clean up certain state transitions in DreamService." into klp-modular-dev
* commit '8db6d9af58b9b81dbd764acd3f6a379afb539bf6':
  Clean up certain state transitions in DreamService.
2014-04-03 03:25:02 +00:00
Jeff Brown
8db6d9af58 Merge "Clean up certain state transitions in DreamService." into klp-modular-dev 2014-04-03 03:20:01 +00:00
Jeff Brown
344812d2f3 Clean up certain state transitions in DreamService.
Instead of posting onDreamingStarted() to a handler from attach(), do
the work immediately.  This ensures that the dream is actually in the
expected state when the callback runs.  Previously it was possible
for the callback to run after detach() occurred which could cause
exceptions and unexpected behavior.  As it happens, there's no need
to post this callback since attach() already runs on the UI thread.

Handle certain races involving the window token lifecycle a little
better.  When the dream manager shuts down a dream, it removes the
window token.  This can happen before the dream completes its attach()
phase in which case a BadTokenException is thrown.  We now handle this
exception and abort the dream in anticipation of receiving a request
to finish it immediately.

Add a safeguard to getDozeHardware() to handle the case where it
might inadvertently be called at the wrong point in the lifecycle.

Bug: 13475612
Bug: 13760290
Change-Id: I9bc9c154370d08d7727b568d398c460a38592099
2014-04-02 20:17:32 -07:00
Jeff Tinker
4f342e878d am 4995d725: Merge "Add signature|system permission to MediaDrm signer APIs" into klp-modular-dev
* commit '4995d72520d16302fca13bc4614d1dd3c0d1c17c':
  Add signature|system permission to MediaDrm signer APIs
2014-04-03 01:35:28 +00:00
Jeff Tinker
4995d72520 Merge "Add signature|system permission to MediaDrm signer APIs" into klp-modular-dev 2014-04-03 01:30:42 +00:00
Jinsuk Kim
f2fe3505da am 31518f74: Merge "Use build property for CEC device OSD name" into klp-modular-dev
* commit '31518f745ffa5e832274c332ac957a065948fdaf':
  Use build property for CEC device OSD name
2014-04-03 00:39:23 +00:00
Jeff Tinker
65c94e6959 Add signature|system permission to MediaDrm signer APIs
Also addresses style issues noted in post-submit review from
https://googleplex-android-review.git.corp.google.com/#/c/439054/

Change-Id: If177b11dbcc049bc271529c119bc5c36ae0107b5
related-to-bug: 12702350
2014-04-02 16:43:10 -07:00
Jinsuk Kim
60b17cc094 Use build property for CEC device OSD name
Previously OSD name was based on device type. This CL makes it
independent of device type. CEC spec says "A device that implements
more than one type of CEC functionality should respond with the same
OSD name for each logical address. It is recommended that the name
refers to the complete physical product rather than the individual
CEC functionality".

Now the default name comes from system build property. I removed
setOsdName() from aidl for now since it won't be in use.

Change-Id: I3c9fb877fad4bc5efef56268d155a3f37a865fc2
2014-04-03 07:59:27 +09:00
Jinsuk Kim
4c963841db am b1dca162: Merge "Maintain display power status for playback device" into klp-modular-dev
* commit 'b1dca1624dc8d853a52d1918c7672173e9b79836':
  Maintain display power status for playback device
2014-04-02 22:43:52 +00:00
Jinsuk Kim
b1dca1624d Merge "Maintain display power status for playback device" into klp-modular-dev 2014-04-02 22:39:41 +00:00
Baligh Uddin
65b2d089c3 Import translations. DO NOT MERGE
Change-Id: Iedc52a08baa64f6294add074ebf597d09c06725a
Auto-generated-cl: translation import
2014-04-02 08:49:36 -07:00
Ben Murdoch
cf61c9b71f Update ViewRootImpl for 64bit functor type.
Change-Id: Ie9020f0276c58ebf0977e4aef725fbc26aaf67b2
2014-04-02 14:41:41 +01:00
Narayan Kamath
71ab4f4f48 am ea9e5eca: am 17b1b8fe: Merge "Move zygote startup logic to the frameworks."
* commit 'ea9e5ecac1e5240370f0e3f998b9c8b159ee9320':
  Move zygote startup logic to the frameworks.
2014-04-02 10:41:24 +00:00
Narayan Kamath
973b4663b0 Move zygote startup logic to the frameworks.
The Zygote class is now in com.android.internal.os. It is
responsible for the vast majority of work before and after
the call to fork(). It calls back into the Runtime via
the new dalvik.system.ZygoteHooks class to allow the Runtime
to perform pre fork cleanup and post fork initialization.

The native code in Zygote.cpp is a direct and straightforward
port of the existing code in art. Most differences are
superficial, for example :
- We use C style logging (ALOGE) instead of stream based
  logging.
- We call env->FatalError() instead of using LOG(FATAL)

Change-Id: Ia101fb2af12d23894fe57e4134d2bc6d142e5059
2014-04-02 10:18:43 +01:00
Jinsuk Kim
4e90fcd190 Maintain display power status for playback device
With this CL, the power status of TV/display is keep tracked of
by hdmi cec server part, specfically HdmiCecDevicePlayback.
Turned the HdmiCecDevice to abstract class from which classes of
concrete device type(HdmiCecDevicePlayback, HdmiCecDeviceTV) are
inherited. The display power status code is put in HdmiCecDevicePlayback
only. HdmiCecDeviceTv will have its own logic that manages power status of
devices connected to it. For now it only has a bare minimum code.
Will be worked on in follow up CLs.

Other changes:

    - Replaced sendGiveDevicePowerStatus() with isTvOn() so that the status
      can be queried by clients.

    - Defensively check the availability of HdmiCecService so that
      HdmiCecManager.getClient() returns null in case the service couldn't
      be initialized. This ensures clients of the service gets the nulled-out
      HdmiCecClient when called in the state/configuration where the service
      is not available, thus proceed accordingly.

Change-Id: Idaf69e73cfbd639c0b40b1bd4b6146f011246180
2014-04-02 14:46:14 +09:00
Michael Kolb
2c73e08d36 am 17bbd976: Merge "Add outset to decor view measuring" into klp-modular-dev
* commit '17bbd976c0971f25447b2ce66117f08029dc2fa9':
  Add outset to decor view measuring
2014-04-01 20:46:38 +00:00
Michael Kolb
17bbd976c0 Merge "Add outset to decor view measuring" into klp-modular-dev 2014-04-01 20:40:35 +00:00
Katie McCormick
fb19fc61f2 am 905a5b14: am 87d9d1a0: Doc Update: revert PendingIntent fix.
* commit '905a5b1477b3a1899ef389dbe081f9c70a4fe13d':
  Doc Update: revert PendingIntent fix.
2014-04-01 00:21:34 +00:00
Katie McCormick
905a5b1477 am 87d9d1a0: Doc Update: revert PendingIntent fix.
* commit '87d9d1a0405e6cdbcd7c87cfebee04b622100753':
  Doc Update: revert PendingIntent fix.
2014-04-01 00:15:52 +00:00
Michael Kolb
5de886a158 Add outset to decor view measuring
Change-Id: Ib0e68311ff8ed1fccf9219b28c42ee43c5952050
2014-03-31 16:49:55 -07:00
Katie McCormick
87d9d1a040 Doc Update: revert PendingIntent fix.
Original fix was in error. Reverting. See:

b/10641568

Change-Id: I471157388b2d55aa99bd16813c07607b8a0a7046
2014-03-31 16:18:15 -07:00
Baligh Uddin
ee800b04d9 Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-03-31 22:11:33 +00:00
Zhihai Xu
7d394df2ab am ae1b763c: Merge "LE: Add API to configure MTU for a given connection (3/4)" into klp-modular-dev
* commit 'ae1b763cded7e2cb3eec3cbec0680c25e55c109c':
  LE: Add API to configure MTU for a given connection (3/4)
2014-03-31 21:28:47 +00:00
Zhihai Xu
ae1b763cde Merge "LE: Add API to configure MTU for a given connection (3/4)" into klp-modular-dev 2014-03-31 21:21:54 +00:00
Brian Carlstrom
7156b7c65d am b11952d6: am e3434fc4: Merge "Improve detail message for X509TrustManagerExtensions argument validation"
* commit 'b11952d6f6851dbd1da447da967f6e07984942fe':
  Improve detail message for X509TrustManagerExtensions argument validation
2014-03-31 19:59:31 +00:00
Baligh Uddin
23f64109d0 Import translations. DO NOT MERGE
Change-Id: Iaac2af2440931132501062c4eab4ab609fea8857
Auto-generated-cl: translation import
2014-03-31 11:37:11 -07:00
Brian Carlstrom
ff9ca781d0 Improve detail message for X509TrustManagerExtensions argument validation
Bug: 13728564
Change-Id: I03d08babcdc0d11baff5e76a339b4285e92edee8
2014-03-31 11:22:34 -07:00
Wei Wang
1b09c97d8a am 4447405d: Merge "Callback on correct method when status is unsuccessful." into klp-modular-dev
* commit '4447405d76b5a9152aacadbfdefd1f8fd60a03ad':
  Callback on correct method when status is unsuccessful.
2014-03-29 01:57:31 +00:00
Wei Wang
4447405d76 Merge "Callback on correct method when status is unsuccessful." into klp-modular-dev 2014-03-29 01:53:33 +00:00
Wei Wang
c07a5dd709 Callback on correct method when status is unsuccessful.
Change-Id: I63c07bbae559765af1aecb492379ab18268336d8
2014-03-29 01:42:41 +00:00
Michael Wright
5d7db503bd am e9eb58c9: Merge "Add InputDevice#supportsSource(int)." into klp-modular-dev
* commit 'e9eb58c9a0f48f1ea3afa60f01cfab1f539e5d8e':
  Add InputDevice#supportsSource(int).
2014-03-29 00:59:49 +00:00