OSDN Git Service
Scott Main [Wed, 13 Feb 2013 18:12:33 +0000 (10:12 -0800)]
am
1214e975: am
3baf1b6f: am
60d8836e: am
be4d1dcd: am
dd8b5845: Merge "docs: add info about secure adb" into jb-mr1-dev
# Via Android Git Automerger (4) and others
* commit '
1214e975d65dc5604ac95ed3ce7565333fa3e364':
docs: add info about secure adb
Scott Main [Wed, 13 Feb 2013 18:10:08 +0000 (10:10 -0800)]
am
3baf1b6f: am
60d8836e: am
be4d1dcd: am
dd8b5845: Merge "docs: add info about secure adb" into jb-mr1-dev
# Via Android Git Automerger (3) and others
* commit '
3baf1b6f44c8f9f851e165f1b818a475b4b09fed':
docs: add info about secure adb
Scott Main [Wed, 13 Feb 2013 18:08:43 +0000 (10:08 -0800)]
am
60d8836e: am
be4d1dcd: am
dd8b5845: Merge "docs: add info about secure adb" into jb-mr1-dev
# Via Android Git Automerger (2) and others
* commit '
60d8836e0dcd46645d73ef7fb34257aef5e5a927':
docs: add info about secure adb
Scott Main [Wed, 13 Feb 2013 18:07:47 +0000 (10:07 -0800)]
am
be4d1dcd: am
dd8b5845: Merge "docs: add info about secure adb" into jb-mr1-dev
# Via Android (Google) Code Review (1) and others
* commit '
be4d1dcd0118e2933c8467a13d5e8cb7abbb9707':
docs: add info about secure adb
Scott Main [Wed, 13 Feb 2013 18:05:41 +0000 (10:05 -0800)]
am
dd8b5845: Merge "docs: add info about secure adb" into jb-mr1-dev
# Via Android (Google) Code Review (1) and Scott Main (1)
* commit '
dd8b58457c6ce18ec98f1b2419300aa8c9cd326d':
docs: add info about secure adb
Scott Main [Wed, 13 Feb 2013 18:01:32 +0000 (18:01 +0000)]
Merge "docs: add info about secure adb" into jb-mr1-dev
Joe Fernandez [Wed, 13 Feb 2013 17:47:57 +0000 (09:47 -0800)]
am
4c28487a: am
45df16aa: am
6e372639: am
30890f28: am
c5cb262c: Merge "docs: Keystore/Cert warning for Signing Apps, Issue:
8180111" into jb-mr1-dev
# Via Android Git Automerger (4) and others
* commit '
4c28487acd5f0f52d212190925d424d898fbb672':
docs: Keystore/Cert warning for Signing Apps, Issue:
8180111
Joe Fernandez [Wed, 13 Feb 2013 17:45:59 +0000 (09:45 -0800)]
am
45df16aa: am
6e372639: am
30890f28: am
c5cb262c: Merge "docs: Keystore/Cert warning for Signing Apps, Issue:
8180111" into jb-mr1-dev
# Via Android Git Automerger (3) and others
* commit '
45df16aa73c6665f55c86f4a9998e6b383b751ca':
docs: Keystore/Cert warning for Signing Apps, Issue:
8180111
Joe Fernandez [Wed, 13 Feb 2013 17:43:02 +0000 (09:43 -0800)]
am
6e372639: am
30890f28: am
c5cb262c: Merge "docs: Keystore/Cert warning for Signing Apps, Issue:
8180111" into jb-mr1-dev
# Via Android Git Automerger (2) and others
* commit '
6e372639f8c9a3ccda58a9d6cc321abb60eb62b1':
docs: Keystore/Cert warning for Signing Apps, Issue:
8180111
Joe Fernandez [Wed, 13 Feb 2013 17:40:59 +0000 (09:40 -0800)]
am
30890f28: am
c5cb262c: Merge "docs: Keystore/Cert warning for Signing Apps, Issue:
8180111" into jb-mr1-dev
# Via Android (Google) Code Review (1) and others
* commit '
30890f2853dc7d2871d4485e2af3467bb7960b88':
docs: Keystore/Cert warning for Signing Apps, Issue:
8180111
Joe Fernandez [Wed, 13 Feb 2013 17:38:54 +0000 (09:38 -0800)]
am
c5cb262c: Merge "docs: Keystore/Cert warning for Signing Apps, Issue:
8180111" into jb-mr1-dev
# Via Android (Google) Code Review (1) and Joe Fernandez (1)
* commit '
c5cb262cc6bd47a5a2ad71866cb6d9961713842a':
docs: Keystore/Cert warning for Signing Apps, Issue:
8180111
Joe Fernandez [Wed, 13 Feb 2013 17:35:22 +0000 (17:35 +0000)]
Merge "docs: Keystore/Cert warning for Signing Apps, Issue:
8180111" into jb-mr1-dev
Joe Fernandez [Wed, 13 Feb 2013 00:55:43 +0000 (16:55 -0800)]
docs: Keystore/Cert warning for Signing Apps, Issue:
8180111
Change-Id: Iab2a06fc27922aafbf10b821550098c040e2a4b2
Baligh Uddin [Wed, 13 Feb 2013 16:43:11 +0000 (08:43 -0800)]
Import translations. DO NOT MERGE
Change-Id: I19f0cf6b89a1bfb5d95aeafc7a639716b86f618e
Auto-generated-cl: translation import
Chet Haase [Wed, 13 Feb 2013 15:29:35 +0000 (15:29 +0000)]
Merge "Fix getHitRect() to return correct rect for transformed child"
Joe Fernandez [Wed, 13 Feb 2013 15:23:26 +0000 (07:23 -0800)]
am
c698a855: am
d1c9d6e8: am
3b8381e1: am
7bb37c87: am
0480d5d8: Merge "docs: Android SDK 21.1.0 Release Notes" into jb-mr1-dev
# Via Android Git Automerger (4) and others
* commit '
c698a855d27520bac00677f78136b48e617ba333':
docs: Android SDK 21.1.0 Release Notes
Joe Fernandez [Wed, 13 Feb 2013 15:21:08 +0000 (07:21 -0800)]
am
d1c9d6e8: am
3b8381e1: am
7bb37c87: am
0480d5d8: Merge "docs: Android SDK 21.1.0 Release Notes" into jb-mr1-dev
# Via Android Git Automerger (3) and others
* commit '
d1c9d6e84969ee36f8a3b74515bae715727866a1':
docs: Android SDK 21.1.0 Release Notes
Joe Fernandez [Wed, 13 Feb 2013 15:18:49 +0000 (07:18 -0800)]
am
3b8381e1: am
7bb37c87: am
0480d5d8: Merge "docs: Android SDK 21.1.0 Release Notes" into jb-mr1-dev
# Via Android Git Automerger (2) and others
* commit '
3b8381e1ed71258957718b8cc8dca46ee587c0fe':
docs: Android SDK 21.1.0 Release Notes
Joe Fernandez [Wed, 13 Feb 2013 15:16:16 +0000 (07:16 -0800)]
am
7bb37c87: am
0480d5d8: Merge "docs: Android SDK 21.1.0 Release Notes" into jb-mr1-dev
# Via Android (Google) Code Review (1) and others
* commit '
7bb37c8748b6c7e36a18b7e55cc0b8af65b45099':
docs: Android SDK 21.1.0 Release Notes
Joe Fernandez [Wed, 13 Feb 2013 15:14:10 +0000 (07:14 -0800)]
am
0480d5d8: Merge "docs: Android SDK 21.1.0 Release Notes" into jb-mr1-dev
# Via Android (Google) Code Review (1) and Joe Fernandez (1)
* commit '
0480d5d88c95abebb073dc1ea5a2f20d5ffdef38':
docs: Android SDK 21.1.0 Release Notes
Joe Fernandez [Wed, 13 Feb 2013 15:10:15 +0000 (15:10 +0000)]
Merge "docs: Android SDK 21.1.0 Release Notes" into jb-mr1-dev
Scott Main [Wed, 13 Feb 2013 02:34:50 +0000 (18:34 -0800)]
am
8d21b881: am
6d32f4e8: am
64aa66d1: am
b861a945: am
4cb43d97: Merge "lists.js files for gms and gcm" into jb-mr1-dev
# By Robert Ly
# Via Android Git Automerger (4) and others
* commit '
8d21b8811cddd716411390f48f918c80b286e412':
lists.js files for gms and gcm
Scott Main [Wed, 13 Feb 2013 02:32:33 +0000 (18:32 -0800)]
am
6d32f4e8: am
64aa66d1: am
b861a945: am
4cb43d97: Merge "lists.js files for gms and gcm" into jb-mr1-dev
# By Robert Ly
# Via Android Git Automerger (3) and others
* commit '
6d32f4e86e0fa67561c26582b9a25581744212f1':
lists.js files for gms and gcm
Scott Main [Wed, 13 Feb 2013 02:31:08 +0000 (18:31 -0800)]
am
64aa66d1: am
b861a945: am
4cb43d97: Merge "lists.js files for gms and gcm" into jb-mr1-dev
# By Robert Ly
# Via Android Git Automerger (2) and others
* commit '
64aa66d126b2c382ccbcc50e8690e75175074168':
lists.js files for gms and gcm
Scott Main [Wed, 13 Feb 2013 02:30:05 +0000 (18:30 -0800)]
am
b861a945: am
4cb43d97: Merge "lists.js files for gms and gcm" into jb-mr1-dev
# By Robert Ly
# Via Android (Google) Code Review (1) and others
* commit '
b861a9455ce8018b859d8b670e58324d79d9fd3a':
lists.js files for gms and gcm
Scott Main [Wed, 13 Feb 2013 02:27:57 +0000 (18:27 -0800)]
am
4cb43d97: Merge "lists.js files for gms and gcm" into jb-mr1-dev
# By Robert Ly
# Via Android (Google) Code Review (1) and Robert Ly (1)
* commit '
4cb43d977bb610fc8e2789dc53334569f2aa55e8':
lists.js files for gms and gcm
Scott Main [Wed, 13 Feb 2013 02:24:28 +0000 (02:24 +0000)]
Merge "lists.js files for gms and gcm" into jb-mr1-dev
Robert Ly [Wed, 13 Feb 2013 01:52:19 +0000 (17:52 -0800)]
lists.js files for gms and gcm
Change-Id: I786adfc966986a8e71dc2164740f2a00d60c0159
Philip Milne [Wed, 13 Feb 2013 01:39:05 +0000 (01:39 +0000)]
Merge "Fix for bug:
8184401 - GridLayout accounts for child's size/measurements even when a child is "GONE""
Fabrice Di Meglio [Wed, 13 Feb 2013 01:27:56 +0000 (01:27 +0000)]
Merge "Fix bug #
8185410 BidiFormatter code should not use the Dir enum anymore"
Fabrice Di Meglio [Wed, 13 Feb 2013 01:22:01 +0000 (17:22 -0800)]
Fix bug #
8185410 BidiFormatter code should not use the Dir enum anymore
- replace Dir enum with static final int constants
Change-Id: Ibfd857e9767f14db92e50edb1681fef0d6598d99
Ying Wang [Wed, 13 Feb 2013 01:18:44 +0000 (17:18 -0800)]
Remove the unnecessary framework-res-package-target
Now the dependency should be correctly established by
framework_docs_LOCAL_JAVA_LIBRARIES.
Change-Id: I4c0ed2d3fb2855539027c7a0eb663f5747ae3ebd
Wink Saville [Wed, 13 Feb 2013 01:07:21 +0000 (17:07 -0800)]
Fix broken test.
Change-Id: I8c5649c9b3d917cf13b94d49da44eaf510643df6
Tim Murray [Wed, 13 Feb 2013 00:42:37 +0000 (00:42 +0000)]
Merge "Pass through null LaunchOption structs to standard forEach."
Tim Murray [Wed, 13 Feb 2013 00:22:34 +0000 (16:22 -0800)]
Pass through null LaunchOption structs to standard forEach.
Change-Id: I4dcde6996400207c7e361ff4b7723ec7db832e80
Amith Yamasani [Wed, 13 Feb 2013 00:00:22 +0000 (00:00 +0000)]
Merge "Hacks to fix lockdown"
Geoffrey Borggaard [Thu, 24 Jan 2013 15:03:20 +0000 (10:03 -0500)]
Hacks to fix lockdown
Change-Id: Icf715e84ac7f8bd12eabd01f35860c36a60a8caf
Craig Mautner [Tue, 12 Feb 2013 23:57:09 +0000 (23:57 +0000)]
Merge "Add AppWindowTokens to TaskList."
Dianne Hackborn [Tue, 12 Feb 2013 23:54:56 +0000 (23:54 +0000)]
Merge "Implement issue #
6646859: 4K!!!! 4K!!!! 4K!!!!"
Xavier Ducrohet [Tue, 12 Feb 2013 23:54:02 +0000 (15:54 -0800)]
am
36ee5485: am
5d5c05de: am
b7a4aed9: am
f70b8c1c: Merge "Fix DateFormat for layoutlib." into jb-mr1.1-dev
# Via Android Git Automerger (3) and others
* commit '
36ee5485b85e34008dc31e0f7bace1b2516c5db5':
Fix DateFormat for layoutlib.
Xavier Ducrohet [Tue, 12 Feb 2013 23:52:46 +0000 (15:52 -0800)]
am
5d5c05de: am
b7a4aed9: am
f70b8c1c: Merge "Fix DateFormat for layoutlib." into jb-mr1.1-dev
# Via Android Git Automerger (2) and others
* commit '
5d5c05dee9911eaf8add2d4298641e60f2a113d5':
Fix DateFormat for layoutlib.
Xavier Ducrohet [Tue, 12 Feb 2013 23:50:16 +0000 (15:50 -0800)]
am
b7a4aed9: am
f70b8c1c: Merge "Fix DateFormat for layoutlib." into jb-mr1.1-dev
# Via Android (Google) Code Review (1) and others
* commit '
b7a4aed94eb02731057fdf78eb7bafc8ececadc9':
Fix DateFormat for layoutlib.
Xavier Ducrohet [Tue, 12 Feb 2013 23:48:07 +0000 (15:48 -0800)]
am
f70b8c1c: Merge "Fix DateFormat for layoutlib." into jb-mr1.1-dev
# Via Android (Google) Code Review (1) and Xavier Ducrohet (1)
* commit '
f70b8c1cebbf873031bc92bb6ae3be813830d300':
Fix DateFormat for layoutlib.
Xavier Ducrohet [Tue, 12 Feb 2013 23:44:39 +0000 (23:44 +0000)]
Merge "Fix DateFormat for layoutlib." into jb-mr1.1-dev
Dianne Hackborn [Tue, 12 Feb 2013 23:41:49 +0000 (15:41 -0800)]
Implement issue #
6646859: 4K!!!! 4K!!!! 4K!!!!
Change-Id: Ib05a2eb6a03db50074805a437a3639a7d10684a0
Fabrice Di Meglio [Tue, 12 Feb 2013 23:36:44 +0000 (23:36 +0000)]
Merge "Add BidiFormatter utility"
Jean-Baptiste Queru [Tue, 12 Feb 2013 23:36:24 +0000 (15:36 -0800)]
am
2d130cee: am
c5748148: Merge "Revert "makefile changes for gcm javadocs""
# By Robert Ly
# Via Android Git Automerger (1) and others
* commit '
2d130ceede3dd3af8bcc1d154fb086188c075803':
Revert "makefile changes for gcm javadocs"
Dianne Hackborn [Tue, 12 Feb 2013 23:27:43 +0000 (23:27 +0000)]
Merge "App ops: media ops, set up to be callable from native code."
Jean-Baptiste Queru [Tue, 12 Feb 2013 23:22:06 +0000 (15:22 -0800)]
am
c5748148: Merge "Revert "makefile changes for gcm javadocs""
# By Robert Ly
# Via Gerrit Code Review (1) and Jean-Baptiste Queru (1)
* commit '
c5748148c56e129e7b5cec7fac0921ce7967d054':
Revert "makefile changes for gcm javadocs"
Svetoslav [Tue, 12 Feb 2013 23:04:18 +0000 (23:04 +0000)]
Merge "Adding public event callback instead of the internal one to UiAutomation."
Dianne Hackborn [Tue, 12 Feb 2013 22:59:53 +0000 (14:59 -0800)]
App ops: media ops, set up to be callable from native code.
This is to help implementation of bug #
8181262 and maybe
bug #
8181261
Adds some definition for media ops (though nothing is yet using
them), and re-arranges things a bit so we can implement native
calling in to the app ops service.
Also add some java docs.
Change-Id: I637959745db820e676f23a35a5d2224f51bc6689
Dianne Hackborn [Tue, 12 Feb 2013 23:02:41 +0000 (23:02 +0000)]
Merge "Fix issue #
6595555: deal better with fragmentless headers."
Svetoslav [Tue, 12 Feb 2013 22:56:29 +0000 (14:56 -0800)]
Adding public event callback instead of the internal one to UiAutomation.
It appears that com.android.internal.util.Predicate is in the public
APIs but it is in the internal package. Leaking the predicate APIs is
a mistake and while we cannot fix that, this change is adding legit
public filter interface.
bug:
8183223
Change-Id: I3e2c0ef685d7a832630aaa3ec2e8eae3fb058289
Christopher Tate [Tue, 12 Feb 2013 22:57:58 +0000 (22:57 +0000)]
Merge "For now enable backup/restore DEBUG logs"
Christopher Tate [Tue, 12 Feb 2013 22:57:04 +0000 (14:57 -0800)]
For now enable backup/restore DEBUG logs
Change-Id: I5733251f1e11c8eedb0601ae6751a35134d6419d
Svetoslav [Tue, 12 Feb 2013 22:55:55 +0000 (22:55 +0000)]
Merge "Adding new APIs to UiAutomation."
Irfan Sheriff [Tue, 12 Feb 2013 22:55:11 +0000 (22:55 +0000)]
Merge "Track keys per config and allow cert push from apps"
Stephen Hines [Tue, 12 Feb 2013 22:50:25 +0000 (22:50 +0000)]
Merge "Update RSTest_Compat for stride changes."
Stephen Hines [Tue, 12 Feb 2013 22:47:46 +0000 (22:47 +0000)]
Merge "Check Element in all API levels for copy2DRangeFrom()."
Scott Main [Tue, 5 Feb 2013 22:05:36 +0000 (14:05 -0800)]
docs: add info about secure adb
Change-Id: I6edf5bf20bce328c1e4cb2ec33f01a1439e2dbfa
Stephen Hines [Tue, 12 Feb 2013 22:45:00 +0000 (22:45 +0000)]
Merge "Fix copyFrom() to use proper dimensions for copying."
Stephen Hines [Tue, 12 Feb 2013 22:42:42 +0000 (22:42 +0000)]
Merge "Fix stride/addressing issues for RS tests."
Jean-Baptiste Queru [Tue, 12 Feb 2013 22:32:30 +0000 (22:32 +0000)]
Merge "Revert "makefile changes for gcm javadocs""
Philip Milne [Tue, 12 Feb 2013 22:29:17 +0000 (14:29 -0800)]
Fix for bug:
8184401 - GridLayout accounts for child's size/measurements even when a child is "GONE"
Added a check for GONE status in measurement calculations.
Change-Id: I3ec82b03f3089730f10dbd6916f6245188cd8452
Jason Sams [Tue, 12 Feb 2013 22:22:10 +0000 (22:22 +0000)]
Merge "Add FieldPacker contructor that accepts external storage."
Xavier Ducrohet [Tue, 12 Feb 2013 22:05:32 +0000 (14:05 -0800)]
Fix DateFormat for layoutlib.
Change-Id: I389c9d106b93b9f81dd3614398a5b66ba2b39a70
Robert Ly [Tue, 12 Feb 2013 21:39:28 +0000 (21:39 +0000)]
Revert "makefile changes for gcm javadocs"
This reverts commit
5f9922d7c3bce158e4c7a58929d4075e7c91e32e
Change-Id: I310f27b231c6d64d6d407ae451b189a6ecf6b34f
Robert Ly [Tue, 12 Feb 2013 21:58:44 +0000 (13:58 -0800)]
am
e47033f9: am
4d9aa17a: am
87db373a: am
2328a779: am
9eb66b2d: Merge "Revert "makefile changes for gcm javadocs"" into jb-mr1-dev
# Via Android Git Automerger (4) and Android (Google) Code Review (2)
* commit '
e47033f9294056ab54c63608ab0a46de995fae63':
Revert "makefile changes for gcm javadocs"
Robert Ly [Tue, 12 Feb 2013 21:56:30 +0000 (13:56 -0800)]
am
4d9aa17a: am
87db373a: am
2328a779: am
9eb66b2d: Merge "Revert "makefile changes for gcm javadocs"" into jb-mr1-dev
# Via Android Git Automerger (3) and Android (Google) Code Review (2)
* commit '
4d9aa17a1efcc76fbbd30c1b20338c0d888ae1e8':
Revert "makefile changes for gcm javadocs"
Robert Ly [Tue, 12 Feb 2013 21:54:01 +0000 (13:54 -0800)]
am
87db373a: am
2328a779: am
9eb66b2d: Merge "Revert "makefile changes for gcm javadocs"" into jb-mr1-dev
# Via Android (Google) Code Review (2) and Android Git Automerger (2)
* commit '
87db373a091b1126f2233e053f9549042564870a':
Revert "makefile changes for gcm javadocs"
Robert Ly [Tue, 12 Feb 2013 21:51:52 +0000 (13:51 -0800)]
am
2328a779: am
9eb66b2d: Merge "Revert "makefile changes for gcm javadocs"" into jb-mr1-dev
# Via Android (Google) Code Review (2) and Android Git Automerger (1)
* commit '
2328a77980a8e4aa2dafac1b9a8e228877a7425c':
Revert "makefile changes for gcm javadocs"
Robert Ly [Tue, 12 Feb 2013 21:49:44 +0000 (13:49 -0800)]
am
9eb66b2d: Merge "Revert "makefile changes for gcm javadocs"" into jb-mr1-dev
# Via Android (Google) Code Review
* commit '
9eb66b2db4724da7a2d6575fee29840004f1a5df':
Revert "makefile changes for gcm javadocs"
Robert Ly [Tue, 12 Feb 2013 21:46:06 +0000 (21:46 +0000)]
Merge "Revert "makefile changes for gcm javadocs"" into jb-mr1-dev
Robert Ly [Tue, 12 Feb 2013 21:39:28 +0000 (21:39 +0000)]
Revert "makefile changes for gcm javadocs"
This reverts commit
5f9922d7c3bce158e4c7a58929d4075e7c91e32e
Change-Id: I310f27b231c6d64d6d407ae451b189a6ecf6b34f
Baligh Uddin [Tue, 12 Feb 2013 21:13:01 +0000 (21:13 +0000)]
Merge "Import translations. DO NOT MERGE"
Daniel Sandler [Tue, 12 Feb 2013 19:59:54 +0000 (19:59 +0000)]
Merge "Historical notification access API."
Michael Jurka [Tue, 12 Feb 2013 19:56:53 +0000 (19:56 +0000)]
Merge "Fix Recents transition for RTL languages"
Wink Saville [Tue, 12 Feb 2013 19:55:12 +0000 (19:55 +0000)]
Merge "Turn off debug in CellInfoLte."
Dianne Hackborn [Tue, 12 Feb 2013 19:42:51 +0000 (11:42 -0800)]
Fix issue #
6595555: deal better with fragmentless headers.
If you constructed a preference activity whose first header
didn't have a fragment, this would crash in two-pane mode
because it would try to use that header as the initially
selected header but not have a fragment to show.
We need to have a fragment for whatever header we switch to,
so the code now looks for the first header with a fragment
as the initial header.
Also added some error checks to throw more descriptive
exceptions on bad headers -- when there is no header at all
with a fragment, if the app tries to manually switch to a
header without a fragment.
Change-Id: Ia84221fcb2fe5755bb674e0606ac2a1fcde4cdc9
Daniel Sandler [Tue, 12 Feb 2013 13:14:52 +0000 (08:14 -0500)]
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
Baligh Uddin [Tue, 12 Feb 2013 19:24:15 +0000 (11:24 -0800)]
Import translations. DO NOT MERGE
Change-Id: I06e0cc4a9f16f2356a25011fb5784eb5475a6591
Auto-generated-cl: translation import
Marco Nelissen [Tue, 12 Feb 2013 19:16:17 +0000 (11:16 -0800)]
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()"
Marco Nelissen [Tue, 12 Feb 2013 19:14:48 +0000 (11:14 -0800)]
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()"
Robert Ly [Tue, 12 Feb 2013 19:02:43 +0000 (19:02 +0000)]
Merge "resolved conflicts for merge of
6db87978 to master"
Robert Ly [Tue, 12 Feb 2013 18:55:43 +0000 (10:55 -0800)]
resolved conflicts for merge of
6db87978 to master
Change-Id: If439f5730e32fb2044a1e464fab0f6afb6bf1d08
Dianne Hackborn [Tue, 12 Feb 2013 18:54:22 +0000 (18:54 +0000)]
Merge "App ops: the draw on top op now actually controls what is drawn."
Craig Mautner [Mon, 11 Feb 2013 17:39:27 +0000 (09:39 -0800)]
Add AppWindowTokens to TaskList.
- Add/remove/move TaskLists from ActivityStack.
- Further isolate mHistory.
- Cleanup warnings by parameterizing ArrayList.
- Fix previous bugs.
Change-Id: Ife8c7b7347479c70f10467cc384283456149ac50
Robert Ly [Tue, 12 Feb 2013 18:48:07 +0000 (10:48 -0800)]
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"
Wink Saville [Tue, 12 Feb 2013 18:47:32 +0000 (10:47 -0800)]
Turn off debug in CellInfoLte.
Change-Id: Icf3ea5dad9eef71f644de2292db0b0d3960ced9d
Romain Guy [Tue, 12 Feb 2013 18:46:29 +0000 (18:46 +0000)]
Merge "Prevent crash when setting up a stencil-based clip Bug #
8177690"
Marco Nelissen [Tue, 12 Feb 2013 18:46:21 +0000 (18:46 +0000)]
Merge "Revert "use utf8_length() instead of local function, isValidUtf8()""
Robert Ly [Tue, 12 Feb 2013 18:44:55 +0000 (10:44 -0800)]
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"
Robert Ly [Tue, 12 Feb 2013 18:43:16 +0000 (10:43 -0800)]
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"
Robert Ly [Tue, 12 Feb 2013 18:41:20 +0000 (10:41 -0800)]
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"
Dianne Hackborn [Tue, 12 Feb 2013 03:29:06 +0000 (19:29 -0800)]
App ops: the draw on top op now actually controls what is drawn.
Change-Id: Iccfc0723a0f92108a4f7d631d74efe21dbc6f157
Robert Ly [Tue, 12 Feb 2013 18:37:51 +0000 (18:37 +0000)]
Merge "Revert "makefile changes for s.a.c"" into jb-mr1-dev
Marco Nelissen [Tue, 12 Feb 2013 18:33:41 +0000 (18:33 +0000)]
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
Irfan Sheriff [Tue, 12 Feb 2013 18:31:37 +0000 (18:31 +0000)]
Merge "Fix NPE"
Robert Ly [Tue, 12 Feb 2013 18:29:10 +0000 (18:29 +0000)]
Revert "makefile changes for s.a.c"
This reverts commit
4c01047ec7b06aabeeae273c7871caa6c3029b84
Change-Id: I4465cfa678717ff7c202347ae6ad36d12d5393bc
Irfan Sheriff [Tue, 12 Feb 2013 17:51:47 +0000 (09:51 -0800)]
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