Commit Graph

119311 Commits

Author SHA1 Message Date
Jeff Brown
4c7e6900c8 Make meaning of PowerManager.isScreenOn() more consistent.
The power manager sends SCREEN_ON and SCREEN_OFF broadcasts
purely based on the current wakefulness state.  In particular,
when the system is awake, we consider the screen to be on even
if the screen may actually be off due to the proximity sensor
or some other condition.  Likewise when the system is dozing
or asleep, we consider the screen to be off although technically
it may still be on and dozing.

This behavior is maintained for compatibility with applications
that interpret screen on / off as an indicator of user presence.

As it happened, the value of PowerManager.isScreenOn() did not
always match the state indicated by the broadcasts under certain
situations.  Instead, it was based on the desired screen state.
These states used to be closely correlated but the addition
of doze mode causes them to diverge in meaning.

One consequence is that wake events from input devices might not
always wake the device from sleep unless the display's power
state was actually DOZING or OFF even if the power manager's
wakefulness was already DOZING or ASLEEP.  This is now fixed.

Change-Id: Ie819c6d2c5a9ffaaf3101c5dee93ff72e9bc9f30
2014-02-27 21:17:34 -08:00
Paul Lawrence
1dd01130cd am e2b220e8: am 0619edd3: am 7ab82a0c: am 657dbc40: am b3776881: am 8b916936: am 2e582d13: am 9bce4032: am 08ee74b1: am ea5586ef: am 4be7c61a: am 5677513b: am da37ed8b: am b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities.
* commit 'e2b220e8c50a7f51edd85e26a3084d9b525587a7':
  Prevent authenticators from using Settings to  launch arbitrary activities.
2014-02-27 22:32:04 +00:00
Carlos Valdivia
78ef794d2d am dc7dfe2e: am b675b474: am 9395f63a: am 55cab009: (-s ours) am 9272db02: am c45bd7f2: Prevent authenticators from using Settings to launch arbitrary activities.
* commit 'dc7dfe2e63a03a7bc057a83bf795dbc4fc869479':
  Prevent authenticators from using Settings to  launch arbitrary activities.
2014-02-27 22:32:01 +00:00
Paul Lawrence
e2b220e8c5 am 0619edd3: am 7ab82a0c: am 657dbc40: am b3776881: am 8b916936: am 2e582d13: am 9bce4032: am 08ee74b1: am ea5586ef: am 4be7c61a: am 5677513b: am da37ed8b: am b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities.
* commit '0619edd3f3b144a9664e8e588285f9351dc2dd96':
  Prevent authenticators from using Settings to  launch arbitrary activities.
2014-02-27 22:28:50 +00:00
Carlos Valdivia
dc7dfe2e63 am b675b474: am 9395f63a: am 55cab009: (-s ours) am 9272db02: am c45bd7f2: Prevent authenticators from using Settings to launch arbitrary activities.
* commit 'b675b474d1838189adc4dfa0e5e1ba1598c82dad':
  Prevent authenticators from using Settings to  launch arbitrary activities.
2014-02-27 22:28:47 +00:00
Paul Lawrence
0619edd3f3 am 7ab82a0c: am 657dbc40: am b3776881: am 8b916936: am 2e582d13: am 9bce4032: am 08ee74b1: am ea5586ef: am 4be7c61a: am 5677513b: am da37ed8b: am b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities.
* commit '7ab82a0c602956251be9dd5539208af9cfecea33':
  Prevent authenticators from using Settings to  launch arbitrary activities.
2014-02-27 22:24:42 +00:00
Carlos Valdivia
b675b474d1 am 9395f63a: am 55cab009: (-s ours) am 9272db02: am c45bd7f2: Prevent authenticators from using Settings to launch arbitrary activities.
* commit '9395f63aa5a386088ad93e3e226ef333084c5b74':
  Prevent authenticators from using Settings to  launch arbitrary activities.
2014-02-27 22:24:39 +00:00
Paul Lawrence
7ab82a0c60 am 657dbc40: am b3776881: am 8b916936: am 2e582d13: am 9bce4032: am 08ee74b1: am ea5586ef: am 4be7c61a: am 5677513b: am da37ed8b: am b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities.
* commit '657dbc40427c17cbf31be1a17cf2fa7a4116722a':
  Prevent authenticators from using Settings to  launch arbitrary activities.
2014-02-27 22:21:05 +00:00
Carlos Valdivia
9395f63aa5 am 55cab009: (-s ours) am 9272db02: am c45bd7f2: Prevent authenticators from using Settings to launch arbitrary activities.
* commit '55cab009f0c9b1939f8336e26144850a5fdc9d3a':
  Prevent authenticators from using Settings to  launch arbitrary activities.
2014-02-27 22:21:01 +00:00
Paul Lawrence
657dbc4042 am b3776881: am 8b916936: am 2e582d13: am 9bce4032: am 08ee74b1: am ea5586ef: am 4be7c61a: am 5677513b: am da37ed8b: am b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities.
* commit 'b37768816cd9c530dcbb3a8f51d87536406a975b':
  Prevent authenticators from using Settings to  launch arbitrary activities.
2014-02-27 12:04:07 -08:00
Paul Lawrence
b37768816c am 8b916936: am 2e582d13: am 9bce4032: am 08ee74b1: am ea5586ef: am 4be7c61a: am 5677513b: am da37ed8b: am b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities.
* commit '8b91693683895a8b148f6ffea8944cef2ba8d99b':
  Prevent authenticators from using Settings to  launch arbitrary activities.
2014-02-27 12:00:08 -08:00
Paul Lawrence
8b91693683 am 2e582d13: am 9bce4032: am 08ee74b1: am ea5586ef: am 4be7c61a: am 5677513b: am da37ed8b: am b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities.
* commit '2e582d1379fa78e2693269d76d2bcd763bfbfba1':
  Prevent authenticators from using Settings to  launch arbitrary activities.
2014-02-27 11:55:10 -08:00
Paul Lawrence
2e582d1379 am 9bce4032: am 08ee74b1: am ea5586ef: am 4be7c61a: am 5677513b: am da37ed8b: am b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities.
* commit '9bce4032e9b3ea3433f7c75cbfb8d784b12392aa':
  Prevent authenticators from using Settings to  launch arbitrary activities.
2014-02-27 11:44:37 -08:00
Paul Lawrence
9bce4032e9 am 08ee74b1: am ea5586ef: am 4be7c61a: am 5677513b: am da37ed8b: am b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities.
* commit '08ee74b1f1c4df28faa4168114853836cc471095':
  Prevent authenticators from using Settings to  launch arbitrary activities.
2014-02-27 11:40:21 -08:00
Paul Lawrence
08ee74b1f1 am ea5586ef: am 4be7c61a: am 5677513b: am da37ed8b: am b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities.
* commit 'ea5586ef7fc29463f8144931c2c43261d15043b1':
  Prevent authenticators from using Settings to  launch arbitrary activities.
2014-02-27 11:38:01 -08:00
Paul Lawrence
ea5586ef7f am 4be7c61a: am 5677513b: am da37ed8b: am b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities.
* commit '4be7c61a339f8200527f6df5a7b2215c96f81b4b':
  Prevent authenticators from using Settings to  launch arbitrary activities.
2014-02-27 11:28:43 -08:00
Paul Lawrence
4be7c61a33 am 5677513b: am da37ed8b: am b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities.
* commit '5677513b7c46ca08a7fa34b9d227d7a448db6757':
  Prevent authenticators from using Settings to  launch arbitrary activities.
2014-02-27 11:24:05 -08:00
Carlos Valdivia
55cab009f0 am 9272db02: am c45bd7f2: Prevent authenticators from using Settings to launch arbitrary activities.
* commit '9272db024d013fbb48ec476c77562ab31d75a461':
  Prevent authenticators from using Settings to  launch arbitrary activities.
2014-02-27 11:22:53 -08:00
Paul Lawrence
5677513b7c am da37ed8b: am b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities.
* commit 'da37ed8b0aebdf885a32cbe28e8fd5a2240d38c3':
  Prevent authenticators from using Settings to  launch arbitrary activities.
2014-02-27 11:20:24 -08:00
Carlos Valdivia
9272db024d am c45bd7f2: Prevent authenticators from using Settings to launch arbitrary activities.
* commit 'c45bd7f20987ed2fd29b9192edb38d02b4caa23b':
  Prevent authenticators from using Settings to  launch arbitrary activities.
2014-02-27 11:17:11 -08:00
Paul Lawrence
da37ed8b0a am b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities.
* commit 'b9ba0c6c43f0f7f0d5e347030e3c86a86ed74542':
  Prevent authenticators from using Settings to  launch arbitrary activities.
2014-02-27 11:16:49 -08:00
Paul Lawrence
b9ba0c6c43 Prevent authenticators from using Settings to launch arbitrary activities.
Various authenticator results such as getAuthToken and addAccount might
result in an Intent returned to the AccountManager caller. A malicious
authenticator could exploit the fact that the Settings are a system app,
lead the user to launch add account for their account type and thus get
Settings to use the intent to start some arbitrary third parties Activity.

The fix is to make sure that the UID of the app associated with Activity
to be launched by the supplied intent and the Authenticators UID share
the same signature.  This means that an authenticator implementer can only
exploit apps they control.

This is a backport of 5bab9daf3c

Bug: 7699048
Change-Id: Ifed345c2fc20020d55fa2cab1f2f7ea509ea09b2
2014-02-27 09:09:48 -08:00
Carlos Valdivia
c45bd7f209 Prevent authenticators from using Settings to launch arbitrary activities.
Various authenticator results such as getAuthToken and addAccount might
result in an Intent returned to the AccountManager caller. A malicious
authenticator could exploit the fact that the Settings are a system app,
lead the user to launch add account for their account type and thus get
Settings to use the intent to start some arbitrary third parties Activity.

The fix is to make sure that the UID of the app associated with Activity
to be launched by the supplied intent and the Authenticators UID share
the same signature.  This means that an authenticator implementer can only
exploit apps they control.

Bug: 7699048
Change-Id: I34330454c341e6a8422ca1ed3b390466a0feedce
(cherry picked from commit 5bab9daf3c)
2014-02-27 17:03:15 +00: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 0fa257fe53

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