Commit Graph

176611 Commits

Author SHA1 Message Date
Jeff Sharkey
1446c6c6f6 am d76737a7: am b802cd67: Merge "APK still has privileged flag after being moved from "/system/priv-app""
* commit 'd76737a7325bdcd5010f26fd1626628f07070bb9':
  APK still has privileged flag after being moved from "/system/priv-app"
2014-11-27 12:01:18 +00:00
Ignacio Solla
a051540e31 am 59565277: (-s ours) am c67b21fa: Merge "[WebView] Allow the WebView to be compiled against the system SDK."
* commit '59565277d9fc1d0f21d55a528b2a6e395f051e5d':
  [WebView] Allow the WebView to be compiled against the system SDK.
2014-11-27 12:01:12 +00:00
Geoff Mendal
de3f61f466 am 7028dec6: (-s ours) am 022f4277: (-s ours) Import translations. DO NOT MERGE
* commit '7028dec6ca10cdc63966dad01e59cdbabd6a0a1d':
  Import translations. DO NOT MERGE
2014-11-27 10:18:58 +00:00
Scott Main
cd79f9f0f4 am 4a45a441: am 2995bd80: am 5a27b4b8: am fc793074: Merge "docs:advmgr-updates" into lmp-docs
* commit '4a45a44152c965363a4689befdcbd57177e48831':
  docs:advmgr-updates
2014-11-27 10:18:52 +00:00
smain@google.com
b8de593ec2 am 576e248f: am 277fb8fd: am d3c17270: am 3a4b011c: define height for context images to avoid content jumps on load
* commit '576e248f3ca32576ed3c37dadf6a4f90dc6b4f59':
  define height for context images to avoid content jumps on load
2014-11-27 10:18:47 +00:00
Narayan Kamath
ff45e7df8a am 1d184ace: resolved conflicts for merge of 7377998d to lmp-mr1-dev
* commit '1d184acefa7105592134edebf7de4d77843d5791':
  Be increasingly aggressive about fstrim if it isn't being run
2014-11-27 10:09:46 +00:00
Geoff Mendal
7028dec6ca am 022f4277: (-s ours) Import translations. DO NOT MERGE
* commit '022f4277c468176d43d4ed1cc12898e33ed1a502':
  Import translations. DO NOT MERGE
2014-11-27 10:09:40 +00:00
Scott Main
4a45a44152 am 2995bd80: am 5a27b4b8: am fc793074: Merge "docs:advmgr-updates" into lmp-docs
* commit '2995bd8033ecbf4e1a5b3392ec27008d2d184b8a':
  docs:advmgr-updates
2014-11-27 10:08:51 +00:00
smain@google.com
576e248f3c am 277fb8fd: am d3c17270: am 3a4b011c: define height for context images to avoid content jumps on load
* commit '277fb8fdaeb546119bc31269425edc72b75e87dd':
  define height for context images to avoid content jumps on load
2014-11-27 10:08:45 +00:00
Narayan Kamath
1d184acefa resolved conflicts for merge of 7377998d to lmp-mr1-dev
Change-Id: I21870e241de7d992e97d7b91e0058f85b5a25fbe
2014-11-27 09:57:35 +00:00
riddle_hsu
105add8d1a [ActivityManager] Prevent provider from been created twice.
Root Cause:
If a process which contains provider is starting but not
from accessing provider, e.g. service/activity/receiver,
its providers' will be created during handleBindApplication.
And before the process complete publish provider to
ActivityManagerService, if there is an access call to
process provider before the process completes publishing
providers to ActivityManagerService, then the providers
will be created again.


Solution:
Don't schedule install provider if the provider record
already exist and will be published later.

Change-Id: Ic200ceae042c014c86e7edee0acd013b513af334
2014-11-27 05:16:17 +00:00
Amit Mahajan
b957d11a53 am 4ebd1e42: Merge "Change to use DATA_ROAMING setting correctly with subId." into lmp-mr1-dev
* commit '4ebd1e42a78dcb0ee219548b89f3733320bbc029':
  Change to use DATA_ROAMING setting correctly with subId.
2014-11-27 03:11:57 +00:00
Amit Mahajan
4ebd1e42a7 Merge "Change to use DATA_ROAMING setting correctly with subId." into lmp-mr1-dev 2014-11-27 03:05:48 +00:00
Alan Viverette
5ed8f27858 Update drawable container constant state following clone
DrawableContainer's internal state was getting out of sync with the
internal state of child classes because we failed to call set state.

BUG: 18542282
Change-Id: Iacaa12042e99c1b9e9eaf08f0ab879d82260e7ee
2014-11-26 17:16:08 -08:00
Alan Viverette
0079f04363 Slightly more button elevation to match Material spec
BUG: 18524727
Change-Id: Ib58fa4bc304fda1cb1e6d71abd3c423cc7e63ebf
2014-11-26 16:48:59 -08:00
Eino-Ville Talvala
223661ec98 am 3eb27d25: am ec26692d: am 9b35b801: Merge "CameraManager: Separate service listener into a singleton" into lmp-mr1-dev
* commit '3eb27d253b609fdce8b6e0e9aa4662631d52a0ce':
  CameraManager: Separate service listener into a singleton
2014-11-27 00:38:17 +00:00
Eino-Ville Talvala
3eb27d253b am ec26692d: am 9b35b801: Merge "CameraManager: Separate service listener into a singleton" into lmp-mr1-dev
* commit 'ec26692d1f65cf04963d8412e3e3bdd0d42796ea':
  CameraManager: Separate service listener into a singleton
2014-11-27 00:33:09 +00:00
tingna_sung
4f65ca0f76 Fix pointer index out of range exception
Avoid pointer index out of range error if return value is -1 of
findPointerIndex() when there is no data available for that pointer
identifier.

Change-Id: I2a08f04c678164e220852094baa124ba157e2e42
Signed-off-by: tingna_sung <tingna_sung@htc.com>
2014-11-27 08:32:14 +08:00
Eino-Ville Talvala
ec26692d1f am 9b35b801: Merge "CameraManager: Separate service listener into a singleton" into lmp-mr1-dev
* commit '9b35b801fb90e31c1dff5535715e505f3a1e26fb':
  CameraManager: Separate service listener into a singleton
2014-11-27 00:27:36 +00:00
Eino-Ville Talvala
9b35b801fb Merge "CameraManager: Separate service listener into a singleton" into lmp-mr1-dev 2014-11-27 00:23:42 +00:00
Alan Viverette
d26276d9e3 Cancel dialog when TimePickerDialog's BUTTON_NEGATIVE is clicked
BUG: 18541882
Change-Id: I2ba4611e08ba08667ef5ee4fb556d1c9075ca6d2
2014-11-26 16:08:58 -08:00
Eric Laurent
539d57aaf0 am 41b2381d: am 981951e4: am 563e61f5: Merge "AudioRecord JNI: pass attributes to native AudioRecord." into lmp-mr1-dev
* commit '41b2381db7225f7ff11c523662de6cfb47fc7c85':
  AudioRecord JNI: pass attributes to native AudioRecord.
2014-11-27 00:08:51 +00:00
Eric Laurent
41b2381db7 am 981951e4: am 563e61f5: Merge "AudioRecord JNI: pass attributes to native AudioRecord." into lmp-mr1-dev
* commit '981951e4f9bae85dcf6f717023596c08dc245ee7':
  AudioRecord JNI: pass attributes to native AudioRecord.
2014-11-27 00:01:23 +00:00
Jeff Davidson
b3ae00d85c am f01fac99: am c452bac6: am 3caf0f8e: Merge "Add string for "Connected via Wi-Fi assistant"." into lmp-mr1-dev
* commit 'f01fac9965f0fd987655fa0a09a29e67503725e2':
  Add string for "Connected via Wi-Fi assistant".
2014-11-27 00:00:12 +00:00
Eric Laurent
981951e4f9 am 563e61f5: Merge "AudioRecord JNI: pass attributes to native AudioRecord." into lmp-mr1-dev
* commit '563e61f5d06aca653894cecc2977bac70b08227c':
  AudioRecord JNI: pass attributes to native AudioRecord.
2014-11-26 23:56:43 +00:00
Jeff Davidson
f01fac9965 am c452bac6: am 3caf0f8e: Merge "Add string for "Connected via Wi-Fi assistant"." into lmp-mr1-dev
* commit 'c452bac6fc100bf30d4ddde5b4e008dd862750e5':
  Add string for "Connected via Wi-Fi assistant".
2014-11-26 23:52:56 +00:00
Eric Laurent
563e61f5d0 Merge "AudioRecord JNI: pass attributes to native AudioRecord." into lmp-mr1-dev 2014-11-26 23:52:08 +00:00
Jeff Davidson
c452bac6fc am 3caf0f8e: Merge "Add string for "Connected via Wi-Fi assistant"." into lmp-mr1-dev
* commit '3caf0f8e440fcc9947b8b153464ccdbc62640c97':
  Add string for "Connected via Wi-Fi assistant".
2014-11-26 23:46:44 +00:00
Mathieu Meisser
ad66d7d2c1 Add keylayout for Logitech RedHawk Gamepad
Change-Id: Iad03de3384052b360d6b9d887ca9540de68cd21e
2014-11-27 00:46:01 +01:00
Jeff Davidson
3caf0f8e44 Merge "Add string for "Connected via Wi-Fi assistant"." into lmp-mr1-dev 2014-11-26 23:42:54 +00:00
Jeff Davidson
6903a1a40f Add string for "Connected via Wi-Fi assistant".
Bug: 18525241
Change-Id: I9900d9216ad1b2d5c4bee584b8f5185b4e552b7d
2014-11-26 15:38:45 -08:00
Olawale Ogunwale
f586072861 am 87c5f362: Merge "Fix bad exclude region in landscape"
* commit '87c5f3621037eda3c4d141e5681d4acbbaa13944':
  Fix bad exclude region in landscape
2014-11-26 23:20:30 +00:00
Olawale Ogunwale
87c5f36210 Merge "Fix bad exclude region in landscape" 2014-11-26 23:13:59 +00:00
Kazuki Nakayama
609cb91c9c Reset killedByAm flag at attachApplicationLocked
ActivityManager reuses a process record object that killed
by him under some situation. That reused process record inherits
a killedByAm flag unexpectedly.
The killedByAm flag must be reset otherwise ActivityManager can't
judge the process can be killed or not.

Change-Id: If95137d91939cc44882ad2813131bcde0edd0c1b
2014-11-26 15:07:33 -08:00
Alan Viverette
ab2cf6dafe Fix visible rect computation for views with padding
Previously, the computation was double-counting the left and top padding
because it was treating the third and fourth Rect.intersect() arguments
as width and height rather than right and bottom.

BUG: 18418091
Change-Id: I2ab669ee5060372ae11cfe804dcc05c7426be1ec
2014-11-26 14:34:36 -08:00
Jeremy Joslin
a68e7d730c Fix the ordering of extra values in the PI.
Bug: 18539720
Change-Id: I6bb69394b05923ca25bc1b4902bc2540a13812bd
2014-11-26 14:24:15 -08:00
Jorim Jaggi
394a5d68b5 Update dark mode on notifications when content is updated
When a notification was updated and we were currently in doze mode,
the views were updated but not all the color filters to make it dark
on it, so we ended up with a colored notification in doze mode.

Bug: 18537470
Change-Id: Ifde70d744a4e04e4c0d13684f3c0088f279f2d78
2014-11-26 23:18:57 +01:00
Eino-Ville Talvala
4c9c7a5883 CameraManager: Separate service listener into a singleton
Currently, every CameraManager instance adds itself as a camera service
listener, which has the unfortunate side effect of keeping them all alive
indefinitely.

This is doubly unfortunate since every CameraManager keeps the Context it
was constructed with, and therefore may be leaking whole Activities along
with the CameraManager itself.

Break out a global per-process CameraManager which handles service
connection keepalive and availability listeners, so that local camera
manager instances can go out of scope as expected.

Bug: 18077200

Change-Id: I1be5fb8d3492131e98bb4a84121400d4abb2b9e1
2014-11-26 13:58:15 -08:00
dcashman
fe8afa99a7 Prevent EntropyMixer from registering with service manager.
EntropyMixer is designed to be triggered in two ways, as either the
result of a self-set timer or of one of three system broadcasts.  It is not
meant to be triggered in any other way, so exposing it via servicemanager
is undesirable.

Bug: 18106000

Cherry-pick of commit: 9287e0dd27

Change-Id: I9aeb35e7ffde75090f4234ea193514fb883b1425
2014-11-26 13:50:30 -08:00
Craig Mautner
980ce4bad0 am 200496b5: Merge "ANR caused by incorrect cleanup in BroadcastQueue."
* commit '200496b5714675a31376e78977713fcbad775fb5':
  ANR caused by incorrect cleanup in BroadcastQueue.
2014-11-26 21:47:35 +00:00
Jinsuk Kim
b62d4ee785 am f657463a: am c69c8dc1: am bc3226e2: Merge "Do not perform forceVolumeControlStream in master volume mode" into lmp-mr1-dev
* commit 'f657463a500e90acb2fa9991cd67629199ef7ab4':
  Do not perform forceVolumeControlStream in master volume mode
2014-11-26 21:45:22 +00:00
Craig Mautner
200496b571 Merge "ANR caused by incorrect cleanup in BroadcastQueue." 2014-11-26 21:43:59 +00:00
Wale Ogunwale
361ca21acc Added unique id to display devices and their settings.
The display setting saved to disk were using a localized name for
the key. This is an issue if the user changes languages after the
display settings have been saved. We now use the non-localized
name for the display to access the settings if it is available,
else we fall back on the localized name.

Bug: 18190800
Change-Id: I837c06a8935df10727229a1aa2bb6eeb3953707f
2014-11-26 13:40:52 -08:00
Jinsuk Kim
f657463a50 am c69c8dc1: am bc3226e2: Merge "Do not perform forceVolumeControlStream in master volume mode" into lmp-mr1-dev
* commit 'c69c8dc15972179728932f91dde483e9d61f34a9':
  Do not perform forceVolumeControlStream in master volume mode
2014-11-26 21:39:08 +00:00
Jinsuk Kim
c69c8dc159 am bc3226e2: Merge "Do not perform forceVolumeControlStream in master volume mode" into lmp-mr1-dev
* commit 'bc3226e21dfe881bf1ccae62e10b660d97b2b232':
  Do not perform forceVolumeControlStream in master volume mode
2014-11-26 21:33:23 +00:00
Jinsuk Kim
bc3226e21d Merge "Do not perform forceVolumeControlStream in master volume mode" into lmp-mr1-dev 2014-11-26 21:27:19 +00:00
Guobin Zhang
04d0bb6e93 ANR caused by incorrect cleanup in BroadcastQueue.
Two broadcasts could be sent to the same app simultaneously:
one foreground, one background. For example, LOCALE_CHANGED
and PACKAGE_CHANGED are delievered to com.android.vending
at the same time.
1. AMS started new vending process to handle LOCALE_CHANGED.
   And set app.curReceiver = LOCALE_CHANGED.
2. Before LOCALE_CHANGED is handled by vending process,
   PACKAGE_CHANGED was delievered to vending process too.
   AMS set app.curReceiver = PACKAGE_CHANGED. Bad!
3. Vending process finished handling LOCALE_CHANGED.
   AMS clear app.curReceiver = NULL. Bad!
   And Vending process  killed itself without handling
   PACKAGE_CHANGED.
4. AMS known vending process has died, but didn't know that
   BgBroadcastQueue was still waiting for finish message
   for PACKAGE_CHANGED.
At last, BgBroadcastQueue reported ANR for PACKAGE_CHANGED.

This patch adds protection before clearing app.curReceiver,
only set to NULL if the finishing receiver = app.curReceiver
So handleAppDied would know that PACKAGE_CHANGED was not
finished yet, it will abort the broadcast and continue.

Change-Id: Ic4f31b35e21823d4a3c27712391ecbede213a494
Signed-off-by: Guobin Zhang <guobin.zhang@intel.com>
2014-11-26 13:23:30 -08:00
Chris Craik
62bdf2c863 am e986817a: am 6eac26a4: am ca84c8b1: Merge "Revert "Force-use the pbuffer surface for destroy"" into lmp-mr1-dev
* commit 'e986817a2dc8a412c12e456319965a67ac60f236':
  Revert "Force-use the pbuffer surface for destroy"
2014-11-26 21:08:00 +00:00
Chris Craik
e986817a2d am 6eac26a4: am ca84c8b1: Merge "Revert "Force-use the pbuffer surface for destroy"" into lmp-mr1-dev
* commit '6eac26a49957eda233ad22ad75da43379f220bbc':
  Revert "Force-use the pbuffer surface for destroy"
2014-11-26 21:02:24 +00:00
Andre Eisenbach
16bf846990 Add server-side callback for change in MTU (4/4)
When a client requests to update the LE transport MTU, the server
currently does not get notified and can therefor not properly size
notifications appropriate to the current MTU.

Bug: 18388114
Change-Id: I515bfc2cc9846490d57de71860f41ea9a61fa243
2014-11-26 12:58:44 -08:00