99981 Commits

Author SHA1 Message Date
Baligh Uddin
0b0952f24b Merge "Import translations. DO NOT MERGE" 2013-02-12 21:13:01 +00:00
Daniel Sandler
1dba35d62d Merge "Historical notification access API." 2013-02-12 20:01:02 +00:00
Michael Jurka
1af81b6bdc Merge "Fix Recents transition for RTL languages" 2013-02-12 19:58:48 +00:00
Wink Saville
29956b8c5a Merge "Turn off debug in CellInfoLte." 2013-02-12 19:55:12 +00:00
Daniel Sandler
78d0d25dca Historical notification access API.
Similar to getActiveNotifications(),
getHistoricalNotifications() returns a list of all
notifications that have been posted, in
reverse-chronological order. It currently includes duplicate
entries for notifications that have been updated (so it
really is tracking every notification that has been posted
to the system).

Change-Id: Icce8d6f96bbe76710c989fd0068ff971c6498605
2013-02-12 14:33:24 -05:00
Baligh Uddin
f706cbdf22 Import translations. DO NOT MERGE
Change-Id: I06e0cc4a9f16f2356a25011fb5784eb5475a6591
Auto-generated-cl: translation import
2013-02-12 11:24:15 -08:00
Marco Nelissen
145716e7c1 am 789e3fa0: am 9f03d4f9: Merge "Revert "use utf8_length() instead of local function, isValidUtf8()""
# Via Gerrit Code Review (2) and Android Git Automerger (1)
* commit '789e3fa052747feb72e8ffdc778d5bc19a718c06':
  Revert "use utf8_length() instead of local function, isValidUtf8()"
2013-02-12 11:16:17 -08:00
Marco Nelissen
789e3fa052 am 9f03d4f9: Merge "Revert "use utf8_length() instead of local function, isValidUtf8()""
# Via Gerrit Code Review
* commit '9f03d4f921fab5757a791653891ce73c2d006e20':
  Revert "use utf8_length() instead of local function, isValidUtf8()"
2013-02-12 11:14:48 -08:00
Robert Ly
28b05169c0 Merge "resolved conflicts for merge of 6db87978 to master" 2013-02-12 19:02:47 +00:00
Robert Ly
590aaea06d resolved conflicts for merge of 6db87978 to master
Change-Id: If439f5730e32fb2044a1e464fab0f6afb6bf1d08
2013-02-12 10:55:43 -08:00
Dianne Hackborn
b41af58f49 Merge "App ops: the draw on top op now actually controls what is drawn." 2013-02-12 18:54:23 +00:00
Robert Ly
6db8797827 am f38aed8c: am f303a7fd: am a95a64dd: am dc8ee206: Merge "Revert "makefile changes for s.a.c"" into jb-mr1-dev
# Via Android Git Automerger (3) and Android (Google) Code Review (2)
* commit 'f38aed8c2c0eaceac0176ff2ddec6db50f4a4080':
  Revert "makefile changes for s.a.c"
2013-02-12 10:48:07 -08:00
Wink Saville
e2c5081218 Turn off debug in CellInfoLte.
Change-Id: Icf3ea5dad9eef71f644de2292db0b0d3960ced9d
2013-02-12 10:47:32 -08:00
Romain Guy
d1a84242a7 Merge "Prevent crash when setting up a stencil-based clip Bug #8177690" 2013-02-12 18:46:46 +00:00
Marco Nelissen
9f03d4f921 Merge "Revert "use utf8_length() instead of local function, isValidUtf8()"" 2013-02-12 18:46:22 +00:00
Robert Ly
f38aed8c2c am f303a7fd: am a95a64dd: am dc8ee206: Merge "Revert "makefile changes for s.a.c"" into jb-mr1-dev
# Via Android (Google) Code Review (2) and Android Git Automerger (2)
* commit 'f303a7fd774f97eca79bfa44eb7d25a394d0abf4':
  Revert "makefile changes for s.a.c"
2013-02-12 10:44:55 -08:00
Robert Ly
f303a7fd77 am a95a64dd: am dc8ee206: Merge "Revert "makefile changes for s.a.c"" into jb-mr1-dev
# Via Android (Google) Code Review (2) and Android Git Automerger (1)
* commit 'a95a64ddd6155e90308aa1368e2c8098d86e677f':
  Revert "makefile changes for s.a.c"
2013-02-12 10:43:16 -08:00
Robert Ly
a95a64ddd6 am dc8ee206: Merge "Revert "makefile changes for s.a.c"" into jb-mr1-dev
# Via Android (Google) Code Review
* commit 'dc8ee2066a45adc6a57157c550e65317c8650ca0':
  Revert "makefile changes for s.a.c"
2013-02-12 10:41:20 -08:00
Dianne Hackborn
b6b23ecdfc App ops: the draw on top op now actually controls what is drawn.
Change-Id: Iccfc0723a0f92108a4f7d631d74efe21dbc6f157
2013-02-12 10:40:16 -08:00
Robert Ly
dc8ee2066a Merge "Revert "makefile changes for s.a.c"" into jb-mr1-dev 2013-02-12 18:37:51 +00:00
Marco Nelissen
a0a73ed1e6 Revert "use utf8_length() instead of local function, isValidUtf8()"
This reverts commit 1a8b6c29aaa5a1591097daca0876808cc029cbda

Reason for revert: utf8_length handles a slightly different range than the checkjni code, so it's possible for a given string to pass the utf8_length check, but then fail the jni  check.

Change-Id: I81e15c95edd8f89782d8ad9025e68502b9340f22
2013-02-12 18:33:41 +00:00
Irfan Sheriff
702b42dd74 Merge "Fix NPE" 2013-02-12 18:31:37 +00:00
Robert Ly
343a89c2cd Revert "makefile changes for s.a.c"
This reverts commit 4c01047ec7b06aabeeae273c7871caa6c3029b84

Change-Id: I4465cfa678717ff7c202347ae6ad36d12d5393bc
2013-02-12 18:29:10 +00:00
Irfan Sheriff
9dab7d6705 Fix NPE
Supplicant sometimes reports 00:00:00:00:00:00 as group owner address causing
an NPE.

Avoid updating from peer list and let connection continue since group owner
address is not essential for data transfer to continue.

Bug: 8158711
Change-Id: I06ce88d7fb426fec4965087968f738dd2a7a7799
2013-02-12 10:05:54 -08:00
Wink Saville
0ef4397125 Merge "Fix record logging." 2013-02-12 18:03:47 +00:00
Michael Jurka
bde3104ddc Merge "Prevent SecurityException from crashing Recents" 2013-02-12 10:15:31 +00:00
Robert Ly
f065d0f024 remove sac make target to fix build
Change-Id: I44c51e12225cd0b1d82bfb70129fefa8ba66e8b4
2013-02-11 20:58:43 -08:00
Scott Main
ae16a9b2ca am 4cd50a12: am b8656b3c: am 42ac0372: am 72091355: am bfec2a01: docs: nudge dashboard chart to the right to avoid overlap
# Via Android Git Automerger (4) and Scott Main (1)
* commit '4cd50a1212ca0e94569eb04ac1a7f25967c7585c':
  docs: nudge dashboard chart to the right to avoid overlap
2013-02-11 18:15:10 -08:00
Jeff Brown
7600f85f07 am f98e18e6: am d9f98c81: Fix build break due to merge.
# Via Android Git Automerger (1) and Jean-Baptiste Queru (1)
* commit 'f98e18e68d82dbb508bf2deafa63bcdca643e125':
  Fix build break due to merge.
2013-02-11 18:14:53 -08:00
Robert Ly
e68cb0acd4 am a578ade2: am 1c4311cc: am 4af36f4e: am 96b1b403: am 4c01047e: makefile changes for s.a.c
# Via Android Git Automerger (4) and Robert Ly (1)
* commit 'a578ade219c07a04f7e8374939734de6ca7cc478':
  makefile changes for s.a.c
2013-02-11 18:14:45 -08:00
Romain Guy
e67307c816 Prevent crash when setting up a stencil-based clip
Bug #8177690

Clear the layers before we setup the stencil to avoid dereferencing
the recently deleted rects.

Change-Id: I5dce5f965672f276f9490636d85b6018d3ab9422
2013-02-11 18:04:23 -08:00
Romain Guy
22f0d8c949 Merge "Always honor fixed size children" 2013-02-12 01:50:31 +00:00
Svetoslav
35ae8748fe Merge "Optimize loading of resource name when reported to accessibility." 2013-02-12 01:48:48 +00:00
Romain Guy
f16c7a9754 Always honor fixed size children
Change-Id: If49a9486c554223132663cd9f0dc388d102ebbff
2013-02-11 17:45:04 -08:00
Svetoslav
a33243eb64 Optimize loading of resource name when reported to accessibility.
Loading of the resource id name was unnecessarily complex and
was generating spam in the log as a result.

bug:8153518

Change-Id: Ib2c1118fd36b86ba8ce803ba3190fa01ab06e8c3
2013-02-11 17:35:18 -08:00
Dirk Dougherty
9a79eccab5 am ef1d1793: am c0614c44: am b6efefb4: am 337d3e32: am 7d849491: Doc change: fix typos.
# Via Android Git Automerger (4) and Dirk Dougherty (1)
* commit 'ef1d17938e9ae3cd02c4b72b331d3892f369138a':
  Doc change: fix typos.
2013-02-11 17:34:23 -08:00
Dianne Hackborn
1f7d30770a Fix build.
Change-Id: Iaace063eaa65af842effa3e0b481a0629db58e42
2013-02-11 17:03:32 -08:00
Scott Main
4cd50a1212 am b8656b3c: am 42ac0372: am 72091355: am bfec2a01: docs: nudge dashboard chart to the right to avoid overlap
# Via Android Git Automerger (3) and Scott Main (1)
* commit 'b8656b3c7af99c8951459661fa5352adde5d2645':
  docs: nudge dashboard chart to the right to avoid overlap
2013-02-11 16:59:42 -08:00
Scott Main
b8656b3c7a am 42ac0372: am 72091355: am bfec2a01: docs: nudge dashboard chart to the right to avoid overlap
# Via Android Git Automerger (2) and Scott Main (1)
* commit '42ac0372159e3204f20de0ad94e51932aab4a030':
  docs: nudge dashboard chart to the right to avoid overlap
2013-02-11 16:57:14 -08:00
Scott Main
42ac037215 am 72091355: am bfec2a01: docs: nudge dashboard chart to the right to avoid overlap
# Via Android Git Automerger (1) and Scott Main (1)
* commit '7209135504313c27da4f277235e00db6851b9577':
  docs: nudge dashboard chart to the right to avoid overlap
2013-02-11 16:55:08 -08:00
Scott Main
7209135504 am bfec2a01: docs: nudge dashboard chart to the right to avoid overlap
# Via Scott Main
* commit 'bfec2a01896959ba2bc9a995238eb31644ea8dc6':
  docs: nudge dashboard chart to the right to avoid overlap
2013-02-11 16:52:51 -08:00
Dianne Hackborn
681533e000 Merge "Fix issue #8176917: Stabillity : Native Crash :" 2013-02-12 00:44:26 +00:00
Dianne Hackborn
1d3079cb8d Merge "App ops: cleanup, handle root and shell, perms." 2013-02-12 00:41:07 +00:00
Dianne Hackborn
e5b50a65ad Fix issue #8176917: Stabillity : Native Crash :
/system/lib/libandroidfw.so

Change-Id: I235470fac7ad0f5a5d3432006f4dfa69620e30d8
2013-02-11 16:18:42 -08:00
Wink Saville
f643069ad5 Fix record logging.
Change-Id: I246159dec9522e58ee88593000ac0f86aff4bb25
2013-02-11 16:16:02 -08:00
Robert Greenwalt
72baa8fbb2 Merge "Reintroduce the net.dns system properties <TEMP>" 2013-02-11 23:57:47 +00:00
Amith Yamasani
20949a76fe Fix UserManager test
Change-Id: I927ffdda3dd5f69dc136e65c8069f2e480badfe9
2013-02-11 15:47:30 -08:00
Dianne Hackborn
514074fae8 App ops: cleanup, handle root and shell, perms.
Rework how the shell user is defined so that it is
associated with an actual apk, instead of being a free
roaming uid with special permissions assigned to it.
This allows us to correctly account for its operations
in app ops.

Implement a special case for the root user in app ops --
it is always allowed, always with the package name "root".

Add various code to take care of cleaning up package state
from app ops -- when packages are uninstalled, and during
boot if any packages currently being stored no longer exist.

Also fix a bug in the activity manager to correctly grant
permissions in all cases when onNewIntent() is being called.

Change-Id: Iae9f6d793ee48b93518c984ad957e46ae4582581
2013-02-11 15:33:48 -08:00
Robert Greenwalt
0dd19a8394 Reintroduce the net.dns system properties <TEMP>
Removing these properties broke video playback as they used
a custom dns resolver.  We'll work together to resolve our
resolver issues in the future, but this was the easy fix to
get things working again.

bug:8173236
Change-Id: I687dae59eda4fc449efc34eed11c3dc88a110ad0
2013-02-11 15:25:10 -08:00
Amith Yamasani
636c61ed41 Merge "Starting point for User Restrictions API" 2013-02-11 23:17:07 +00:00