OSDN Git Service
Will Haldean Brown [Fri, 28 Feb 2014 19:04:41 +0000 (11:04 -0800)]
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
Jeff Brown [Wed, 26 Feb 2014 23:12:45 +0000 (15:12 -0800)]
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
Craig Mautner [Tue, 25 Feb 2014 20:17:15 +0000 (12:17 -0800)]
Modify API to hide ActivityView.
Fixes build too.
Change-Id: Ibd571cf36c89691a37c45db59c31237fee17adac
Craig Mautner [Tue, 25 Feb 2014 18:46:01 +0000 (18:46 +0000)]
Merge "Clean up activities and displays when done" into klp-modular-dev
Craig Mautner [Tue, 25 Feb 2014 01:54:35 +0000 (17:54 -0800)]
Clean up activities and displays when done
More maintenance fixes.
Fix bug
13157352.
Change-Id: Ic86d39a84452a1cf1dc1762cec517b419ad0a852
Robert Greenwalt [Tue, 25 Feb 2014 18:25:11 +0000 (18:25 +0000)]
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
Robert Greenwalt [Tue, 25 Feb 2014 18:21:50 +0000 (18:21 +0000)]
am
cf73f46a: am
43ec3b93: am
1f9ebc5f: (-s ours) am
868d4c34: am
95023066: DO NOT MERGE Sanitize WifiConfigs
* commit '
cf73f46a514f5c2b1a0de137ed203401417307b4':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Tue, 25 Feb 2014 18:18:05 +0000 (18:18 +0000)]
am
43ec3b93: am
1f9ebc5f: (-s ours) am
868d4c34: am
95023066: DO NOT MERGE Sanitize WifiConfigs
* commit '
43ec3b939b732ea2d3b26635c51a6c91f2692270':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Tue, 25 Feb 2014 18:14:26 +0000 (18:14 +0000)]
am
1f9ebc5f: (-s ours) am
868d4c34: am
95023066: DO NOT MERGE Sanitize WifiConfigs
* commit '
1f9ebc5fa73e7d324429a697cd10abb3761b1ff0':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Tue, 25 Feb 2014 18:12:35 +0000 (10:12 -0800)]
am
868d4c34: am
95023066: DO NOT MERGE Sanitize WifiConfigs
* commit '
868d4c341034de6e2ebb6c1a247488b00d17c78d':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Tue, 25 Feb 2014 18:09:13 +0000 (10:09 -0800)]
am
95023066: DO NOT MERGE Sanitize WifiConfigs
* commit '
950230663fb3a9af438ec2ee57605fc9e7a58428':
DO NOT MERGE Sanitize WifiConfigs
Hui Lu [Tue, 25 Feb 2014 17:53:41 +0000 (17:53 +0000)]
Merge "Reconnect/teardown proxy network connectivity." into klp-modular-dev
Mike Lockwood [Tue, 25 Feb 2014 15:44:24 +0000 (15:44 +0000)]
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
Mike Lockwood [Tue, 25 Feb 2014 15:41:11 +0000 (15:41 +0000)]
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
Mike Lockwood [Tue, 25 Feb 2014 15:38:25 +0000 (15:38 +0000)]
am
5daec5b5: Merge "UsbDeviceManager: Fix race condition entering USB accessory mode" into klp-dev
* commit '
5daec5b58a89779b0f8775f52859bae0bda17b23':
UsbDeviceManager: Fix race condition entering USB accessory mode
Mike Lockwood [Tue, 25 Feb 2014 15:35:33 +0000 (15:35 +0000)]
Merge "UsbDeviceManager: Fix race condition entering USB accessory mode" into klp-dev
Jeff Brown [Tue, 25 Feb 2014 00:27:41 +0000 (00:27 +0000)]
Merge "Fix typo that causes dreaming on battery." into klp-modular-dev
Justin Koh [Tue, 25 Feb 2014 00:20:45 +0000 (00:20 +0000)]
Merge "DO NOT MERGE EGL14.eglCreateWindowSurface should set producerControlledByApp" into klp-modular-dev
Jeff Brown [Tue, 25 Feb 2014 00:19:51 +0000 (16:19 -0800)]
Fix typo that causes dreaming on battery.
Bug:
13173012
Change-Id: I611970a5b4c4b0072ce52e3fc6a57dd3a0c075b3
Takahiro Aizawa [Wed, 11 Dec 2013 10:22:26 +0000 (19:22 +0900)]
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
Robert Greenwalt [Fri, 7 Feb 2014 11:52:12 +0000 (03:52 -0800)]
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
Jeff Brown [Mon, 24 Feb 2014 22:15:59 +0000 (22:15 +0000)]
Merge "Start the dream manager even if dreams are not supported." into klp-modular-dev
Jeff Brown [Mon, 24 Feb 2014 21:57:53 +0000 (13:57 -0800)]
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
Craig Mautner [Sat, 22 Feb 2014 05:11:22 +0000 (05:11 +0000)]
Merge "Fixes for ActivityView on home activity" into klp-modular-dev
Craig Mautner [Sat, 22 Feb 2014 05:08:00 +0000 (21:08 -0800)]
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
Scott Main [Sat, 22 Feb 2014 00:53:21 +0000 (00:53 +0000)]
am
271f8539: am
b26117ac: am
25b44ae6: Merge "add android studio to launch procedures" into klp-docs
* commit '
271f85399bbbe0b6a6719286a4b0857ff845cfc2':
add android studio to launch procedures
Craig Mautner [Sat, 22 Feb 2014 00:50:55 +0000 (00:50 +0000)]
Merge "Reset deferred task removal when app token added." into klp-modular-dev
Scott Main [Sat, 22 Feb 2014 00:50:08 +0000 (00:50 +0000)]
am
b26117ac: am
25b44ae6: Merge "add android studio to launch procedures" into klp-docs
* commit '
b26117aca0daadeb51369c8da617d5b7ba9b05b6':
add android studio to launch procedures
Scott Main [Sat, 22 Feb 2014 00:47:08 +0000 (00:47 +0000)]
am
25b44ae6: Merge "add android studio to launch procedures" into klp-docs
* commit '
25b44ae684295b53ac7ba15d827fc03c51aee37b':
add android studio to launch procedures
Craig Mautner [Sat, 22 Feb 2014 00:46:22 +0000 (16:46 -0800)]
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
Scott Main [Sat, 22 Feb 2014 00:43:26 +0000 (00:43 +0000)]
Merge "add android studio to launch procedures" into klp-docs
Adam Lesinski [Fri, 21 Feb 2014 22:13:44 +0000 (22:13 +0000)]
Merge "Fix broken IME when decrypting storage" into klp-modular-dev
Adam Lesinski [Fri, 21 Feb 2014 22:06:47 +0000 (14:06 -0800)]
Fix broken IME when decrypting storage
Bug:
13113499
Change-Id: Icf767864c8ff694fd569b9237ae1004cc20204a2
Craig Mautner [Fri, 21 Feb 2014 04:25:41 +0000 (20:25 -0800)]
Add copyright notice to files missing them.
Fixes bug
13121968.
Change-Id: Ifd86581178e7e98bd72b832020e7c8379d40b2de
Craig Mautner [Thu, 20 Feb 2014 22:36:52 +0000 (22:36 +0000)]
Merge "Set the new SurfaceControl opaque flag." into klp-modular-dev
Craig Mautner [Thu, 20 Feb 2014 22:34:38 +0000 (22:34 +0000)]
Merge "Resize DimLayer explicitly on rotation." into klp-modular-dev
Craig Mautner [Thu, 20 Feb 2014 22:31:32 +0000 (14:31 -0800)]
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
Jeff Brown [Thu, 20 Feb 2014 21:43:42 +0000 (21:43 +0000)]
Merge "Add a new "doze mode" based on Dream components." into klp-modular-dev
Jeff Brown [Fri, 31 Jan 2014 05:47:47 +0000 (21:47 -0800)]
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
Baligh Uddin [Thu, 20 Feb 2014 18:39:46 +0000 (18:39 +0000)]
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
Baligh Uddin [Thu, 20 Feb 2014 18:39:43 +0000 (18:39 +0000)]
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
Baligh Uddin [Thu, 20 Feb 2014 18:36:38 +0000 (18:36 +0000)]
am
810267c3: (-s ours) am
28009e81: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
810267c309f018c5b58b0a2e787b8a6434faa0e0':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Feb 2014 18:36:35 +0000 (18:36 +0000)]
am
8ca432c7: (-s ours) am
c2803d47: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
8ca432c7828d5d3d00c721b195a4ecb59564bbb7':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Feb 2014 18:33:18 +0000 (18:33 +0000)]
am
28009e81: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
28009e8102aa91294362cc2d7770cab73d02e640':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Feb 2014 18:33:13 +0000 (18:33 +0000)]
am
c2803d47: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
c2803d473ad180fa70e5000f0607795c92c4035d':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Feb 2014 18:31:02 +0000 (18:31 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Thu, 20 Feb 2014 18:30:49 +0000 (18:30 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Thu, 20 Feb 2014 18:10:15 +0000 (18:10 +0000)]
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
Baligh Uddin [Thu, 20 Feb 2014 18:07:02 +0000 (18:07 +0000)]
am
1af20cc5: (-s ours) am
554b43a0: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
1af20cc5764a38d0713a292fd63bf6a628f2f5eb':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Feb 2014 18:06:24 +0000 (18:06 +0000)]
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
Baligh Uddin [Thu, 20 Feb 2014 18:06:21 +0000 (18:06 +0000)]
am
8b297fb6: (-s ours) am
8027100f: (-s ours) am
e9adafd1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
8b297fb6ef42650a1126287aa0b610aa9a503167':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Feb 2014 18:06:17 +0000 (18:06 +0000)]
am
08394af2: (-s ours) am
e69b7b34: (-s ours) am
46a02249: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
08394af265b02db7a76c4f4f4ae16b9d238e7580':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Feb 2014 18:03:38 +0000 (18:03 +0000)]
am
554b43a0: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
554b43a066b6a084dbb9b7dba014de4b12ba1175':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Feb 2014 18:03:07 +0000 (18:03 +0000)]
am
f887a67d: (-s ours) am
aa20b274: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
f887a67dbd1fd22c16cadc58b8f23bfd4eeba4ef':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Feb 2014 18:03:05 +0000 (18:03 +0000)]
am
8027100f: (-s ours) am
e9adafd1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
8027100fdb13c046838f9af12ef7bf2bc3ad511f':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Feb 2014 18:03:02 +0000 (18:03 +0000)]
am
e69b7b34: (-s ours) am
46a02249: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
e69b7b3474c356438fbd65e43438e72ebda0bacb':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Feb 2014 17:59:50 +0000 (17:59 +0000)]
am
aa20b274: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
aa20b27472552ebc812dfbb3cbe260115ee43db1':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Feb 2014 17:59:47 +0000 (17:59 +0000)]
am
e9adafd1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
e9adafd1b95a7934bb813cb168e33a85a762a504':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Feb 2014 17:59:45 +0000 (17:59 +0000)]
am
46a02249: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
46a02249d7bde3fb88cc5312f88dab6d1690e20e':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Feb 2014 17:59:40 +0000 (17:59 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Thu, 20 Feb 2014 17:55:32 +0000 (17:55 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Thu, 20 Feb 2014 17:55:23 +0000 (17:55 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Thu, 20 Feb 2014 17:55:13 +0000 (17:55 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Xavier Ducrohet [Thu, 20 Feb 2014 17:49:32 +0000 (17:49 +0000)]
am
2cb9147f: am
55542ee6: am
3e637042: Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into klp-dev
* commit '
2cb9147fc49e6474eaf30fd833e43df10e42b899':
Set default text style in layoutlib as NORMAL [DO NOT MERGE]
Deepanshu Gupta [Thu, 20 Feb 2014 17:49:27 +0000 (17:49 +0000)]
am
ca4b9a77: am
e92c8542: am
01825b7a: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
* commit '
ca4b9a77e7d20703287b33b203b2582bd43f7792':
Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
Xavier Ducrohet [Thu, 20 Feb 2014 17:46:05 +0000 (17:46 +0000)]
am
55542ee6: am
3e637042: Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into klp-dev
* commit '
55542ee6449bd580f61bc005726b5c87773fbe25':
Set default text style in layoutlib as NORMAL [DO NOT MERGE]
Deepanshu Gupta [Thu, 20 Feb 2014 17:46:02 +0000 (17:46 +0000)]
am
e92c8542: am
01825b7a: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
* commit '
e92c8542a5cf1160a1b701b9f176af64ba46d68d':
Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
Xavier Ducrohet [Thu, 20 Feb 2014 17:42:58 +0000 (17:42 +0000)]
am
3e637042: Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into klp-dev
* commit '
3e6370425ea3ac4e5d89ce042512913062212ccc':
Set default text style in layoutlib as NORMAL [DO NOT MERGE]
Deepanshu Gupta [Thu, 20 Feb 2014 17:42:54 +0000 (17:42 +0000)]
am
01825b7a: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
* commit '
01825b7aa3c864426c78c08c2f6004a8362c2b47':
Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
Xavier Ducrohet [Thu, 20 Feb 2014 17:41:07 +0000 (17:41 +0000)]
Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into klp-dev
Justin Koh [Thu, 20 Feb 2014 17:38:03 +0000 (17:38 +0000)]
Merge "Add hardware feature describing a watch." into klp-modular-dev
Baligh Uddin [Thu, 20 Feb 2014 06:16:02 +0000 (22:16 -0800)]
Import translations. DO NOT MERGE
Change-Id: I9accaa37043e730ad6ec4aa98901a48e0858b132
Auto-generated-cl: translation import
Baligh Uddin [Thu, 20 Feb 2014 06:08:21 +0000 (22:08 -0800)]
Import translations. DO NOT MERGE
Change-Id: I0c823200179a75e0444f6e86ecc6813a6e662fa0
Auto-generated-cl: translation import
Baligh Uddin [Thu, 20 Feb 2014 03:42:43 +0000 (19:42 -0800)]
Import translations. DO NOT MERGE
Change-Id: If9205c555286daf7dea68702d2da39752b59def4
Auto-generated-cl: translation import
Baligh Uddin [Thu, 20 Feb 2014 02:54:52 +0000 (18:54 -0800)]
Import translations. DO NOT MERGE
Change-Id: I31e5b7b7aa453a0455fd31eca6a11520730a26a7
Auto-generated-cl: translation import
Baligh Uddin [Thu, 20 Feb 2014 02:49:33 +0000 (18:49 -0800)]
Import translations. DO NOT MERGE
Change-Id: I3003f43c32943496e855ba2744a7492232dbd56b
Auto-generated-cl: translation import
Baligh Uddin [Thu, 20 Feb 2014 02:45:30 +0000 (18:45 -0800)]
Import translations. DO NOT MERGE
Change-Id: I3300523019b91cffd6f36d02434c521ab7368f37
Auto-generated-cl: translation import
Scott Main [Thu, 20 Feb 2014 02:23:52 +0000 (02:23 +0000)]
am
4c68c4ed: am
24a8e1d0: am
af87e19b: Merge "update intent examples for maps bug:
12661490 bug:
12957723" into klp-docs
* commit '
4c68c4ed463f7f83d05f86ed11046195829028ed':
update intent examples for maps bug:
12661490 bug:
12957723
Scott Main [Thu, 20 Feb 2014 02:20:30 +0000 (02:20 +0000)]
am
24a8e1d0: am
af87e19b: Merge "update intent examples for maps bug:
12661490 bug:
12957723" into klp-docs
* commit '
24a8e1d0e9a32c571403bfc730ce18dd138a529c':
update intent examples for maps bug:
12661490 bug:
12957723
Scott Main [Thu, 20 Feb 2014 02:17:20 +0000 (02:17 +0000)]
am
af87e19b: Merge "update intent examples for maps bug:
12661490 bug:
12957723" into klp-docs
* commit '
af87e19bdbf6b16240dcdbfd31fe4f33eca4e51d':
update intent examples for maps bug:
12661490 bug:
12957723
Scott Main [Thu, 20 Feb 2014 02:14:40 +0000 (02:14 +0000)]
Merge "update intent examples for maps bug:
12661490 bug:
12957723" into klp-docs
Scott Main [Sat, 15 Feb 2014 02:37:24 +0000 (18:37 -0800)]
update intent examples for maps
bug:
12661490
bug:
12957723
Change-Id: Ice25ef430901b155c00d59402c5f9f50dcb48390
Deepanshu Gupta [Wed, 19 Feb 2014 18:53:27 +0000 (10:53 -0800)]
Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
For these font families, text was always rendered as italic. This
changeset fixes the issue.
Bug: http://b.android.com/57221
Change-Id: Ic8a299bd1e555f5bb914cd3d2fe72917ec7f471a
(cherry picked from commit
e327212adde1136807bbdf052e8cc3861f8a6aba)
Deepanshu Gupta [Wed, 19 Feb 2014 19:05:02 +0000 (11:05 -0800)]
Set default text style in layoutlib as NORMAL [DO NOT MERGE]
If a style doesn't specify text style (normal/bold/italic/bold-italic)
then default to normal instead of throwing an error.
Bug: http://b.android.com/61358
Change-Id: I0138c73807a5ff6e4d938a99ece3044333110aa1
(cherry picked from commit
0acfb16dcd95468fe032204f54618e86becfd1eb)
Adam Lesinski [Wed, 19 Feb 2014 19:38:33 +0000 (19:38 +0000)]
Merge "Make UsbService optional" into klp-modular-dev
Adam Lesinski [Wed, 19 Feb 2014 19:38:17 +0000 (19:38 +0000)]
Merge "Add fastpath for single signature comparison" into klp-modular-dev
Mike Lockwood [Wed, 19 Feb 2014 19:18:02 +0000 (11:18 -0800)]
UsbDeviceManager: Fix race condition entering USB accessory mode
When switching USB modes there are often spurious connect and disconnect events
that occur before reenumeration is complete. There is currently a 1000ms timer
to "debounce" the disconnect events. But with some USB accessories, this timeout
is not long enough, which results in an endless cycle of attempts to enter
USB accessory mode when the phone is connected.
To fix this, we now wait up to 10 seconds for the host to successfully configure
the device when entering USB accessory mode before giving up.
This is separate from the existing debounce timer, so the behavior of the
USB state change broadcasts are not affected.
Bug:
12877769
Change-Id: I7aa61f8a618546d749a7ddfc97bf103029a73d03
John Spurlock [Wed, 19 Feb 2014 13:51:00 +0000 (13:51 +0000)]
am
9dd87081: am
99873565: am
ba231fca: Fix bad @links in PendingIntent.java
* commit '
9dd87081e4bea9cd48db35fa82b3adeda37a34b5':
Fix bad @links in PendingIntent.java
John Spurlock [Wed, 19 Feb 2014 13:47:52 +0000 (13:47 +0000)]
am
99873565: am
ba231fca: Fix bad @links in PendingIntent.java
* commit '
998735652d2449e3ccbac7686b71bf40dca06e94':
Fix bad @links in PendingIntent.java
John Spurlock [Wed, 19 Feb 2014 13:44:14 +0000 (13:44 +0000)]
am
ba231fca: Fix bad @links in PendingIntent.java
* commit '
ba231fcabfdf8f8bd72dbb428b8d35ae14a1a14d':
Fix bad @links in PendingIntent.java
Justin Koh [Fri, 14 Feb 2014 00:06:59 +0000 (16:06 -0800)]
Add hardware feature describing a watch.
Add hardware feature describing a watch so that hardware can specify that
it is a device that is worn on the body (perhaps the wrist).
Change-Id: I9d4cb7e86067f6ad41b39bcc545222b3b0fbf890
Craig Mautner [Tue, 18 Feb 2014 23:48:52 +0000 (15:48 -0800)]
Set the new SurfaceControl opaque flag.
Converts surfaces from transparent to opaque and opaque to transparent
without creating a new surface. Uses the new SurfaceControl.setOpaque
method.
Fixes bug
12387406.
Change-Id: I669c064e622e211b00b1585183a488d5b3f4b778
Craig Mautner [Tue, 18 Feb 2014 23:56:53 +0000 (23:56 +0000)]
Merge "Allow "opaque" flag to be updated. DO NOT MERGE" into klp-modular-dev
Andy McFadden [Thu, 30 Jan 2014 01:18:05 +0000 (17:18 -0800)]
Allow "opaque" flag to be updated. DO NOT MERGE
Added a setOpaque() call and a bunch of comments.
Bug
12387406
Change-Id: Ic066cba926223f22f9bc56a7013987001d9cc795
Adam Lesinski [Tue, 18 Feb 2014 23:21:13 +0000 (15:21 -0800)]
Add fastpath for single signature comparison
PackageManager does not need to create a hash set
when comparing two sets of signatures, where each set
contains one signature. This is the common case for
most applications.
Bug:
13029313
Change-Id: I61883d85960db7b376e234d7abae6149c4d20245
Adam Lesinski [Sat, 15 Feb 2014 01:19:56 +0000 (17:19 -0800)]
Make UsbService optional
Tweaked the services Android.mk to build dependencies
when building with mm[m].
Change-Id: I6dad511c652bcacc085f27ede5f8f22a6982c6bd
Adam Lesinski [Tue, 18 Feb 2014 22:05:14 +0000 (14:05 -0800)]
Create FEATURE_ constants for print and backup
Bug:
13079822
Change-Id: I6f4b759951d45989e8aad4011fae431ee2ecae0c
Hui Lu [Thu, 6 Feb 2014 19:02:26 +0000 (14:02 -0500)]
Reconnect/teardown proxy network connectivity.
Change-Id: I9bf6f96883a2151fceef788e65d9a767d0f52c69
John Spurlock [Tue, 18 Feb 2014 18:19:57 +0000 (13:19 -0500)]
Fix bad @links in PendingIntent.java
Change-Id: I0a0014e17907f5cf16c3536a99e41efa9dafc963
Jeff Brown [Fri, 14 Feb 2014 07:02:05 +0000 (23:02 -0800)]
Remove onCreate() method that should not be there.
Change-Id: I8355dd78f910afa9895d2fa00cb627a0885d9eec
OSDN Git Service
