119289 Commits

Author SHA1 Message Date
Will Haldean Brown
866b25425e Maintain binding to crashed listeners from NotificationManagerService.
This fixes the logic on the death handlers for notification listeners,
and doesn't unbind from the listener services so that the system will
bring them back up again.

Bug: 12587702
Change-Id: I44ce250e0e1c2583836dc823d9a333dabec51df9
2014-02-28 11:26:47 -08:00
Jeff Brown
6ca90042b3 Add touch.wake IDC property to control wakeup.
Normally we do not wake the device when the internal touch screen is
touched.  This behavior can now be configured by setting a property
in the input device configuration file.  Add the following line to
the IDC file to enable an initial touch to wake the device from sleep.

  touch.wake = 1

Change-Id: Ifd6d4f51afacd30d85f475725a66e6fcccde9cbb
2014-02-26 15:15:53 -08:00
Craig Mautner
42ec503567 Modify API to hide ActivityView.
Fixes build too.

Change-Id: Ibd571cf36c89691a37c45db59c31237fee17adac
2014-02-25 12:17:15 -08:00
Craig Mautner
dd9ce6287e Merge "Clean up activities and displays when done" into klp-modular-dev 2014-02-25 18:46:01 +00:00
Craig Mautner
95da1087ed Clean up activities and displays when done
More maintenance fixes.

Fix bug 13157352.

Change-Id: Ic86d39a84452a1cf1dc1762cec517b419ad0a852
2014-02-25 10:40:18 -08:00
Robert Greenwalt
41c684a7b5 am 0d39ef72: am cf73f46a: am 43ec3b93: am 1f9ebc5f: (-s ours) am 868d4c34: am 95023066: DO NOT MERGE Sanitize WifiConfigs
* commit '0d39ef72112972dfadd70ef14c733672e4a2d646':
  DO NOT MERGE Sanitize WifiConfigs
2014-02-25 18:25:11 +00:00
Robert Greenwalt
0d39ef7211 am cf73f46a: am 43ec3b93: am 1f9ebc5f: (-s ours) am 868d4c34: am 95023066: DO NOT MERGE Sanitize WifiConfigs
* commit 'cf73f46a514f5c2b1a0de137ed203401417307b4':
  DO NOT MERGE Sanitize WifiConfigs
2014-02-25 18:21:50 +00:00
Robert Greenwalt
cf73f46a51 am 43ec3b93: am 1f9ebc5f: (-s ours) am 868d4c34: am 95023066: DO NOT MERGE Sanitize WifiConfigs
* commit '43ec3b939b732ea2d3b26635c51a6c91f2692270':
  DO NOT MERGE Sanitize WifiConfigs
2014-02-25 18:18:05 +00:00
Robert Greenwalt
43ec3b939b am 1f9ebc5f: (-s ours) am 868d4c34: am 95023066: DO NOT MERGE Sanitize WifiConfigs
* commit '1f9ebc5fa73e7d324429a697cd10abb3761b1ff0':
  DO NOT MERGE Sanitize WifiConfigs
2014-02-25 18:14:26 +00:00
Robert Greenwalt
1f9ebc5fa7 am 868d4c34: am 95023066: DO NOT MERGE Sanitize WifiConfigs
* commit '868d4c341034de6e2ebb6c1a247488b00d17c78d':
  DO NOT MERGE Sanitize WifiConfigs
2014-02-25 10:12:35 -08:00
Robert Greenwalt
868d4c3410 am 95023066: DO NOT MERGE Sanitize WifiConfigs
* commit '950230663fb3a9af438ec2ee57605fc9e7a58428':
  DO NOT MERGE Sanitize WifiConfigs
2014-02-25 10:09:13 -08:00
Hui Lu
95e3cba1f6 Merge "Reconnect/teardown proxy network connectivity." into klp-modular-dev 2014-02-25 17:53:41 +00:00
Mike Lockwood
0fc59cd958 am da2bbaf2: am 2c7b913e: am 5daec5b5: Merge "UsbDeviceManager: Fix race condition entering USB accessory mode" into klp-dev
* commit 'da2bbaf219117f7507c5c0015c41347a9cc27507':
  UsbDeviceManager: Fix race condition entering USB accessory mode
2014-02-25 15:44:24 +00:00
Mike Lockwood
da2bbaf219 am 2c7b913e: am 5daec5b5: Merge "UsbDeviceManager: Fix race condition entering USB accessory mode" into klp-dev
* commit '2c7b913e367670dde337893efd59029c054019fc':
  UsbDeviceManager: Fix race condition entering USB accessory mode
2014-02-25 15:41:11 +00:00
Mike Lockwood
2c7b913e36 am 5daec5b5: Merge "UsbDeviceManager: Fix race condition entering USB accessory mode" into klp-dev
* commit '5daec5b58a89779b0f8775f52859bae0bda17b23':
  UsbDeviceManager: Fix race condition entering USB accessory mode
2014-02-25 15:38:25 +00:00
Mike Lockwood
5daec5b58a Merge "UsbDeviceManager: Fix race condition entering USB accessory mode" into klp-dev 2014-02-25 15:35:34 +00:00
Jeff Brown
2326acb591 Merge "Fix typo that causes dreaming on battery." into klp-modular-dev 2014-02-25 00:27:41 +00:00
Justin Koh
bf3a45f3ad Merge "DO NOT MERGE EGL14.eglCreateWindowSurface should set producerControlledByApp" into klp-modular-dev 2014-02-25 00:20:45 +00:00
Jeff Brown
966604f159 Fix typo that causes dreaming on battery.
Bug: 13173012
Change-Id: I611970a5b4c4b0072ce52e3fc6a57dd3a0c075b3
2014-02-24 16:19:51 -08:00
Takahiro Aizawa
5b4a857603 DO NOT MERGE EGL14.eglCreateWindowSurface should set producerControlledByApp
Interface of Surface class changed.
To reflect the change for EGL14, add producerControlledByApp flag.
Similar change can be seen in 0fa257fe53bf520bdde93996a1901ce6bc3e1788

This is a cherry-pick of https://android-review.googlesource.com/#/c/72973/ which is already in master, so do not merge.

Change-Id: Ic8911d3131e033747cfdabe59ac2fea1e90bb4a0
2014-02-25 00:00:16 +00:00
Robert Greenwalt
950230663f DO NOT MERGE Sanitize WifiConfigs
Do this both on input from apps (giving error) and between wifi and
ConnectivityService (ignoring bad data).  This means removing all
addresses beyond the first and all routes but the first default and
the implied direct-connect routes.

We do this because the user can't monitor the others (no UI), their
support wasn't intended, they allow redirection of all traffic
without user knowledge and they allow circumvention of legacy VPNs.

This should not move forward from JB as it breaks IPv6 and K has
a more resilient VPN.

Bug:12663469
Change-Id: I0d92db7efc30a1bb3e5b8c6e5595bdb9793a16f2

Conflicts:
	core/java/android/net/LinkProperties.java
	services/java/com/android/server/WifiService.java
	wifi/java/android/net/wifi/WifiStateMachine.java
2014-02-24 15:20:32 -08:00
Jeff Brown
f7f80d7b54 Merge "Start the dream manager even if dreams are not supported." into klp-modular-dev 2014-02-24 22:16:00 +00:00
Jeff Brown
e0dd3ca81d Start the dream manager even if dreams are not supported.
The dreams manager also manages dozing.  It has a minimal footprint
so there is no real reason to disable the component (it just makes
debugging more difficult).

Improved the documentation of the config_dreamsSupported resource
to clarify exactly what it controls.

Bug: 12494706
Change-Id: I78244846f7c1ddfd11bc1605af59b0db91337971
2014-02-24 14:07:27 -08:00
Craig Mautner
ffda464851 Merge "Fixes for ActivityView on home activity" into klp-modular-dev 2014-02-22 05:11:22 +00:00
Craig Mautner
12ff7391a1 Fixes for ActivityView on home activity
When the ActivityView is part of the home activity special checks
must be made. Things like don't move the home stack to the back
when the ActivityView activity is resumed.

Fixes bug 13119389.

Change-Id: I3a6040c9824dfd4b8ee97d58d131b14a519b470a
2014-02-21 21:08:00 -08:00
Scott Main
f8a68404c7 am 271f8539: am b26117ac: am 25b44ae6: Merge "add android studio to launch procedures" into klp-docs
* commit '271f85399bbbe0b6a6719286a4b0857ff845cfc2':
  add android studio to launch procedures
2014-02-22 00:53:21 +00:00
Craig Mautner
f0f454522a Merge "Reset deferred task removal when app token added." into klp-modular-dev 2014-02-22 00:50:55 +00:00
Scott Main
271f85399b am b26117ac: am 25b44ae6: Merge "add android studio to launch procedures" into klp-docs
* commit 'b26117aca0daadeb51369c8da617d5b7ba9b05b6':
  add android studio to launch procedures
2014-02-22 00:50:08 +00:00
Scott Main
b26117aca0 am 25b44ae6: Merge "add android studio to launch procedures" into klp-docs
* commit '25b44ae684295b53ac7ba15d827fc03c51aee37b':
  add android studio to launch procedures
2014-02-22 00:47:08 +00:00
Craig Mautner
42bf39edbd Reset deferred task removal when app token added.
A task is scheduled for deletion after the final activity has
been removed and has animated away. But if another activity is then
added to the task the deletion flag must be reset.

Also added improved debugging.

Fixes bug 12987986.

Change-Id: I207ea6e9592a9e036d67aa5d1465b4acc5bdd120
2014-02-21 16:46:22 -08:00
Scott Main
25b44ae684 Merge "add android studio to launch procedures" into klp-docs 2014-02-22 00:43:26 +00:00
Adam Lesinski
83930aa09a Merge "Fix broken IME when decrypting storage" into klp-modular-dev 2014-02-21 22:13:44 +00:00
Adam Lesinski
8793dd873d Fix broken IME when decrypting storage
Bug:13113499
Change-Id: Icf767864c8ff694fd569b9237ae1004cc20204a2
2014-02-21 14:06:47 -08:00
Craig Mautner
c2c0a61cf5 Add copyright notice to files missing them.
Fixes bug 13121968.

Change-Id: Ifd86581178e7e98bd72b832020e7c8379d40b2de
2014-02-20 20:25:41 -08:00
Craig Mautner
fd8a8ccbb7 Merge "Set the new SurfaceControl opaque flag." into klp-modular-dev 2014-02-20 22:36:52 +00:00
Craig Mautner
267b37ceff Merge "Resize DimLayer explicitly on rotation." into klp-modular-dev 2014-02-20 22:34:38 +00:00
Craig Mautner
902945d151 Resize DimLayer explicitly on rotation.
Using the alpha value to trigger a resizing of the DimLayer was a
Bad Idea. The alpha value should reflect the true alpha value and
not be used to trick the code. Actually changing the size and
position is a Better Idea.

Fixes bug 13101776.

Change-Id: I11c16b8276919ea85960fe87bb17c0956ce8a3b1
2014-02-20 14:31:32 -08:00
Jeff Brown
07e6d1b9a5 Merge "Add a new "doze mode" based on Dream components." into klp-modular-dev 2014-02-20 21:43:43 +00:00
Jeff Brown
2687550272 Add a new "doze mode" based on Dream components.
When a doze component has been specified in a config.xml resource
overlay, the power manager will try to start a preconfigured dream
whenever it would have otherwise gone to sleep and turned the
screen off.  The dream should render whatever it intends to show
then call startDozing() to tell the power manager to put the display
into a low power "doze" state and allow the application processor
to be suspended.  The dream may wake up periodically using the
alarm manager or other features to update the contents of the display.

Added several new config.xml resources related to dreams and dozing.
In particular for dozing there are two new resources that pertain to
decoupling auto-suspend mode and interactive mode from the display
state.  This is a requirement to enable the application processor
and other components to be suspended while dozing.  Most devices
do not support these features today.

Consolidated the power manager's NAPPING and DREAMING states into one
to simplify the logic.  The NAPPING state was mostly superfluous
and simply indicated that the power manager should attempt to start
a new dream.  This state is now tracked in the mSandmanSummoned field.

Added a new DOZING state which is analoguous to DREAMING.  The normal
state transition is now: AWAKE -> DREAMING -> DOZING -> ASLEEP.
The PowerManager.goToSleep() method now enters the DOZING state instead
of immediately going to sleep.

While in the doze state, the screen remains on.  However, we actually
tell the rest of the system that the screen is off.  This is somewhat
unfortunate but much of the system makes inappropriate assumptions
about what it means for the screen to be on or off.  In particular,
screen on is usually taken to indicate an interactive state where
the user is present but that's not at all true for dozing (and is
only sometimes true while dreaming).  We will probably need to add
some more precise externally visible states at some point.

The DozeHardware interface encapsulates a generic microcontroller
interface to allow a doze dream for off-loading rendering or other
functions while dozing.  If the device possesses an MCU HAL for dozing
then it is exposed to the DreamService here.

Removed a number of catch blocks in DreamService that caught Throwable
and attempted to cause the dream to finish itself.  We actually just
want to let the process crash.  Cleanup will happen automatically if
needed.  Catching these exceptions results in mysterious undefined
behavior and broken dreams.

Bug: 12494706
Change-Id: Ie78336b37dde7250d1ce65b3d367879e3bfb2b8b
2014-02-20 13:39:13 -08:00
Baligh Uddin
ea17c6365f am 4292ce5d: (-s ours) am 810267c3: (-s ours) am 28009e81: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '4292ce5d0023551a6fa7a02b284bf9b02823b06b':
  Import translations. DO NOT MERGE
2014-02-20 18:39:46 +00:00
Baligh Uddin
701449e853 am c9443fc5: (-s ours) am 8ca432c7: (-s ours) am c2803d47: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'c9443fc54caa789c4e3c64e7d9feaee8ac00506f':
  Import translations. DO NOT MERGE
2014-02-20 18:39:43 +00:00
Baligh Uddin
4292ce5d00 am 810267c3: (-s ours) am 28009e81: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '810267c309f018c5b58b0a2e787b8a6434faa0e0':
  Import translations. DO NOT MERGE
2014-02-20 18:36:38 +00:00
Baligh Uddin
c9443fc54c am 8ca432c7: (-s ours) am c2803d47: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '8ca432c7828d5d3d00c721b195a4ecb59564bbb7':
  Import translations. DO NOT MERGE
2014-02-20 18:36:35 +00:00
Baligh Uddin
810267c309 am 28009e81: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '28009e8102aa91294362cc2d7770cab73d02e640':
  Import translations. DO NOT MERGE
2014-02-20 18:33:18 +00:00
Baligh Uddin
8ca432c782 am c2803d47: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'c2803d473ad180fa70e5000f0607795c92c4035d':
  Import translations. DO NOT MERGE
2014-02-20 18:33:13 +00:00
Baligh Uddin
28009e8102 Merge "Import translations. DO NOT MERGE" into klp-dev 2014-02-20 18:31:03 +00:00
Baligh Uddin
c2803d473a Merge "Import translations. DO NOT MERGE" into klp-dev 2014-02-20 18:30:49 +00:00
Baligh Uddin
50d0afa43a am 2f5347ee: (-s ours) am 1af20cc5: (-s ours) am 554b43a0: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '2f5347ee46766134848586d67d2dd86bdc9d1952':
  Import translations. DO NOT MERGE
2014-02-20 18:10:15 +00:00
Baligh Uddin
2f5347ee46 am 1af20cc5: (-s ours) am 554b43a0: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '1af20cc5764a38d0713a292fd63bf6a628f2f5eb':
  Import translations. DO NOT MERGE
2014-02-20 18:07:02 +00:00
Baligh Uddin
749e6b9cf2 am 5da96060: (-s ours) am f887a67d: (-s ours) am aa20b274: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '5da96060e61c3076d0a5cbd87a3f17254414afeb':
  Import translations. DO NOT MERGE
2014-02-20 18:06:24 +00:00