OSDN Git Service
Deepanshu Gupta [Thu, 27 Aug 2015 01:29:36 +0000 (01:29 +0000)]
am
f2bf5470: (-s ours) am
91e456d2: am
e698bb27: Fix BridgeTypedArray.getType() [DO NOT MERGE]
* commit '
f2bf5470a3ec1f5eb8584e0d7c1a8eb3c08d8d20':
Fix BridgeTypedArray.getType() [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:29:30 +0000 (01:29 +0000)]
am
7ec7805a: (-s ours) am
8a6295e8: am
e481e713: Include Shapes in LayoutLib. [DO NOT MERGE]
* commit '
7ec7805a50893be6242a41de01299cb1de44b461':
Include Shapes in LayoutLib. [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:29:19 +0000 (01:29 +0000)]
am
594939fc: (-s ours) am
66d5f24d: am
ba5a02c5: LayoutLib: Support getting resource arrays. [DO NOT MERGE]
* commit '
594939fc07e83445ef4507df6fcd457069352189':
LayoutLib: Support getting resource arrays. [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:29:10 +0000 (01:29 +0000)]
am
bd343c1f: (-s ours) am
b32e44ff: am
a5ffed0b: LayoutLib: Change nullity annotations. [DO NOT MERGE]
* commit '
bd343c1fbf05087094e1dbf40048137e3a3e08fa':
LayoutLib: Change nullity annotations. [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:29:05 +0000 (01:29 +0000)]
am
9b1ac269: (-s ours) am
1754824c: am
c96ef952: Add documentation about hack in commit:
f8ea750455 [DO NOT MERGE]
* commit '
9b1ac26921b9c7aaf3c43c8094d81cfabc5cc085':
Add documentation about hack in commit:
f8ea750455 [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:28:58 +0000 (01:28 +0000)]
am
6b7f9ae6: (-s ours) am
678f0ea2: am
b318ff54: Make DatePicker rendering not fail (style search fix). [DO NOT MERGE]
* commit '
6b7f9ae6f56375b1bd84f31206cac179e09b8146':
Make DatePicker rendering not fail (style search fix). [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:28:48 +0000 (01:28 +0000)]
am
d6363d86: (-s ours) am
2e57c1e2: am
cc5e69e4: Inject anonymous inner classes of injected classes [DO NOT MERGE]
* commit '
d6363d86060126e20b913dcd6db3c5cc2019804c':
Inject anonymous inner classes of injected classes [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:28:42 +0000 (01:28 +0000)]
am
5b886bb0: (-s ours) am
899daf75: am
d7e89906: Update platformDir search in tests. [DO NOT MERGE]
* commit '
5b886bb08ff59e405c365db51abf71999e8f6c93':
Update platformDir search in tests. [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:28:35 +0000 (01:28 +0000)]
am
aae9c930: (-s ours) am
2f50403f: am
afedbc47: Make Context.getClassLoader() work. [DO NOT MERGE]
* commit '
aae9c9309ca5155124f740b10a40c68b09ed0ce6':
Make Context.getClassLoader() work. [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:28:21 +0000 (01:28 +0000)]
am
522e67e4: (-s ours) am
de3ac8f9: am
92480a9a: Fix include tag rendering. [DO NOT MERGE]
* commit '
522e67e4ac600fb19c18f55f0e51096af9ae37d3':
Fix include tag rendering. [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:28:14 +0000 (01:28 +0000)]
am
8df6131a: (-s ours) am
50e1406a: am
f6b08547: Show better error message for color attr not found. [DO NOT MERGE]
* commit '
8df6131ac103ac58ab03f6aae01e136df3c6a7b1':
Show better error message for color attr not found. [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:28:07 +0000 (01:28 +0000)]
am
59f026e9: (-s ours) am
81990c3f: am
b1370c26: Fix build: udpate parser factory method [DO NOT MERGE]
* commit '
59f026e937e749a77f12614010f8be05123f4837':
Fix build: udpate parser factory method [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:27:52 +0000 (01:27 +0000)]
am
b44f7fda: (-s ours) am
0a07bb95: am
aa729889: Don\'t keep LayoutlibCallback reference. [DO NOT MERGE]
* commit '
b44f7fda759394b6447f19c0b3c9a3fdf8f9cd95':
Don't keep LayoutlibCallback reference. [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:27:45 +0000 (01:27 +0000)]
am
78d77bc3: (-s ours) am
bbbdc2ad: am
5c90c4f4: Remove kxml dependency [DO NOT MERGE]
* commit '
78d77bc379f42dfe020cf0719ceae14174cf1c33':
Remove kxml dependency [DO NOT MERGE]
Tim Kilbourn [Wed, 26 Aug 2015 22:07:37 +0000 (15:07 -0700)]
Handle the -a flag for dumpsys appops.
Bug:
23017449
Change-Id: I6ce9ac368e2739153867c246893eb544d052834f
Alan Viverette [Wed, 26 Aug 2015 20:38:53 +0000 (20:38 +0000)]
Merge "Avoid NPE when getPositionForView() is called on detached view" into mnc-dev
Deepanshu Gupta [Wed, 26 Aug 2015 20:19:23 +0000 (20:19 +0000)]
am
91e456d2: am
e698bb27: Fix BridgeTypedArray.getType() [DO NOT MERGE]
* commit '
91e456d235256c385a7da1e45f098386bc68e86a':
Fix BridgeTypedArray.getType() [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:19:13 +0000 (20:19 +0000)]
am
8a6295e8: am
e481e713: Include Shapes in LayoutLib. [DO NOT MERGE]
* commit '
8a6295e82a2aed91eb26fa15479bf295c2bd79d7':
Include Shapes in LayoutLib. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:19:05 +0000 (20:19 +0000)]
am
66d5f24d: am
ba5a02c5: LayoutLib: Support getting resource arrays. [DO NOT MERGE]
* commit '
66d5f24df0c3627028812ee23da8d4f08cc83e5c':
LayoutLib: Support getting resource arrays. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:18:54 +0000 (20:18 +0000)]
am
b32e44ff: am
a5ffed0b: LayoutLib: Change nullity annotations. [DO NOT MERGE]
* commit '
b32e44ff0c5fd410720bb28c87bc9cea83556edf':
LayoutLib: Change nullity annotations. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:18:47 +0000 (20:18 +0000)]
am
1754824c: am
c96ef952: Add documentation about hack in commit:
f8ea750455 [DO NOT MERGE]
* commit '
1754824c2835d6f3a17c4a2c0ab668991797fcf9':
Add documentation about hack in commit:
f8ea750455 [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:18:34 +0000 (20:18 +0000)]
am
678f0ea2: am
b318ff54: Make DatePicker rendering not fail (style search fix). [DO NOT MERGE]
* commit '
678f0ea2ba47f06387670e9f75b13637a6446899':
Make DatePicker rendering not fail (style search fix). [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:18:27 +0000 (20:18 +0000)]
am
2e57c1e2: am
cc5e69e4: Inject anonymous inner classes of injected classes [DO NOT MERGE]
* commit '
2e57c1e23f43bb0ede6280720559ccc1e866024b':
Inject anonymous inner classes of injected classes [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:18:15 +0000 (20:18 +0000)]
am
899daf75: am
d7e89906: Update platformDir search in tests. [DO NOT MERGE]
* commit '
899daf759e02bef0de14dc1a14b96b4d71f0b9fc':
Update platformDir search in tests. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:18:09 +0000 (20:18 +0000)]
am
2f50403f: am
afedbc47: Make Context.getClassLoader() work. [DO NOT MERGE]
* commit '
2f50403fe0a8a035757b047af00c7520fadb9015':
Make Context.getClassLoader() work. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:18:04 +0000 (20:18 +0000)]
am
de3ac8f9: am
92480a9a: Fix include tag rendering. [DO NOT MERGE]
* commit '
de3ac8f9fc5987ac1f1223da02b4275fdbae3d56':
Fix include tag rendering. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:17:51 +0000 (20:17 +0000)]
am
50e1406a: am
f6b08547: Show better error message for color attr not found. [DO NOT MERGE]
* commit '
50e1406a4ad668179a9a3d28c58d68c0eee44237':
Show better error message for color attr not found. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:17:46 +0000 (20:17 +0000)]
am
81990c3f: am
b1370c26: Fix build: udpate parser factory method [DO NOT MERGE]
* commit '
81990c3f988369c755590288b93508e30024c56c':
Fix build: udpate parser factory method [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:17:40 +0000 (20:17 +0000)]
am
0a07bb95: am
aa729889: Don\'t keep LayoutlibCallback reference. [DO NOT MERGE]
* commit '
0a07bb95a1dd94c3457860a934d3ee546919cff2':
Don't keep LayoutlibCallback reference. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:17:34 +0000 (20:17 +0000)]
am
bbbdc2ad: am
5c90c4f4: Remove kxml dependency [DO NOT MERGE]
* commit '
bbbdc2ad8939c28828a8441c0b24812c53a9eb66':
Remove kxml dependency [DO NOT MERGE]
Alan Viverette [Wed, 26 Aug 2015 19:21:39 +0000 (15:21 -0400)]
Avoid NPE when getPositionForView() is called on detached view
Bug:
23557674
Change-Id: I76cb5f06081b2ac4c8f535df8d1a0aee17d2bb20
Chien-Yu Chen [Wed, 26 Aug 2015 18:56:15 +0000 (18:56 +0000)]
Merge "Camera: Update for reprocess session" into mnc-dev
Nicholas Sauer [Wed, 26 Aug 2015 18:17:03 +0000 (18:17 +0000)]
Merge "Add GET_APP_OPS_STATS to Shell" into mnc-dev
Deepanshu Gupta [Wed, 26 Aug 2015 05:55:37 +0000 (05:55 +0000)]
am
e698bb27: Fix BridgeTypedArray.getType() [DO NOT MERGE]
* commit '
e698bb27f3a0090e01132fd7b5a6d95abcbbfc18':
Fix BridgeTypedArray.getType() [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:55:33 +0000 (05:55 +0000)]
am
e481e713: Include Shapes in LayoutLib. [DO NOT MERGE]
* commit '
e481e713f24c83a3347fd83580d07252d589ec3b':
Include Shapes in LayoutLib. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:55:26 +0000 (05:55 +0000)]
am
ba5a02c5: LayoutLib: Support getting resource arrays. [DO NOT MERGE]
* commit '
ba5a02c5aa3c9850cdd72e592e9fa8a8d92db7ef':
LayoutLib: Support getting resource arrays. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:55:19 +0000 (05:55 +0000)]
am
a5ffed0b: LayoutLib: Change nullity annotations. [DO NOT MERGE]
* commit '
a5ffed0b69ac41d65aacc6ee586688a22226f64b':
LayoutLib: Change nullity annotations. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:55:14 +0000 (05:55 +0000)]
am
c96ef952: Add documentation about hack in commit:
f8ea750455 [DO NOT MERGE]
* commit '
c96ef95285e935034377dee30f3b8a0329f6c3a2':
Add documentation about hack in commit:
f8ea750455 [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:55:07 +0000 (05:55 +0000)]
am
b318ff54: Make DatePicker rendering not fail (style search fix). [DO NOT MERGE]
* commit '
b318ff54fcd17e7aadd1b0251c34cba348898704':
Make DatePicker rendering not fail (style search fix). [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:55:02 +0000 (05:55 +0000)]
am
cc5e69e4: Inject anonymous inner classes of injected classes [DO NOT MERGE]
* commit '
cc5e69e4fed8bb797dc3f83c1de32eaf4a52f324':
Inject anonymous inner classes of injected classes [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:54:58 +0000 (05:54 +0000)]
am
d7e89906: Update platformDir search in tests. [DO NOT MERGE]
* commit '
d7e89906a453a562a8fef303fc6c4068dfa5c0d0':
Update platformDir search in tests. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:54:52 +0000 (05:54 +0000)]
am
afedbc47: Make Context.getClassLoader() work. [DO NOT MERGE]
* commit '
afedbc47b3c8f3fa9955496e6ceb7f5702dd90a3':
Make Context.getClassLoader() work. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:54:44 +0000 (05:54 +0000)]
am
92480a9a: Fix include tag rendering. [DO NOT MERGE]
* commit '
92480a9ad89a813bdf36185fa8c4d227d8415b4c':
Fix include tag rendering. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:54:39 +0000 (05:54 +0000)]
am
f6b08547: Show better error message for color attr not found. [DO NOT MERGE]
* commit '
f6b08547458b9219da1717a79363f778bfc57dd0':
Show better error message for color attr not found. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:54:33 +0000 (05:54 +0000)]
am
b1370c26: Fix build: udpate parser factory method [DO NOT MERGE]
* commit '
b1370c2687f4b03f7b9b36f89bb636b5b65f9531':
Fix build: udpate parser factory method [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:54:28 +0000 (05:54 +0000)]
am
aa729889: Don\'t keep LayoutlibCallback reference. [DO NOT MERGE]
* commit '
aa72988955789be6e790c344daba3ef17abfcd98':
Don't keep LayoutlibCallback reference. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:54:23 +0000 (05:54 +0000)]
am
5c90c4f4: Remove kxml dependency [DO NOT MERGE]
* commit '
5c90c4f459c2a7213a197f7ee98ad71e85af31bc':
Remove kxml dependency [DO NOT MERGE]
Todd Kennedy [Wed, 26 Aug 2015 00:27:46 +0000 (00:27 +0000)]
Merge "Allow extra slop in battery stats" into mnc-dev
Todd Kennedy [Wed, 26 Aug 2015 00:26:57 +0000 (17:26 -0700)]
Allow extra slop in battery stats
Current slop of 30ms was causing too many WTFs to be thrown. Increase the slop
to 750ms.
Bug:
23391894
Change-Id: Ica5be9b00745bfe58872d43be8c32f8c147075ed
Chris Tate [Wed, 26 Aug 2015 00:10:23 +0000 (00:10 +0000)]
Merge "Teach Pm about the "always ask" link-handling state" into mnc-dev
Raph Levien [Tue, 25 Aug 2015 23:25:10 +0000 (23:25 +0000)]
Merge "Truncate and ellipsize app name if too long for dialog." into mnc-dev
Michael Wright [Mon, 24 Aug 2015 23:00:05 +0000 (00:00 +0100)]
Truncate and ellipsize app name if too long for dialog.
If the given app name is too long for the permissions dialog, then
it can push the warning that the application will be able to record
the screen below the fold, letting the app basically set its own
dialog message in a way that a user would be difficult to detect as
fraudulant.
Bug:
23345192
Change-Id: If5881ca75d5c155ef5174351d245dbc3abdaa584
Christopher Tate [Tue, 25 Aug 2015 19:39:04 +0000 (12:39 -0700)]
Teach Pm about the "always ask" link-handling state
Bug
23511867
Change-Id: I74b3c8222a7d22541a96b698edd1a175d378e48f
Deepanshu Gupta [Wed, 27 May 2015 23:57:10 +0000 (16:57 -0700)]
Fix BridgeTypedArray.getType() [DO NOT MERGE]
Also includes some fixes for BridgeTypedArray.getInt() - when value is a
color, when value is an octal int, when value is true/false.
Bug: http://b.android.com/162438
Change-Id: I0b985ea3437be8018d0e116e7a599843cc7aacd6
(cherry picked from commit
5779ad71eabed3aabaefef1e4749693f8320816e)
Deepanshu Gupta [Tue, 26 May 2015 16:24:48 +0000 (09:24 -0700)]
Include Shapes in LayoutLib. [DO NOT MERGE]
Change-Id: Ifb32882c478f8d407ad904e224b67fe2bd65dc08
(cherry picked from commit
59164ec0551aa49f497acca81222f304cf4f344b)
Deepanshu Gupta [Fri, 22 May 2015 22:47:16 +0000 (15:47 -0700)]
LayoutLib: Support getting resource arrays. [DO NOT MERGE]
- Don't crash when Resources.get<Type>Array() is called.
- If the IDE supports it, actually return the value.
- Add tests for getArray.
- Update test app to latest gradle plugin version.
- Switch to using AppTheme for tests, since the tests depend on some
custom theme attributes. The AppTheme now inherits from
Material.Light.DarkActionBar, so other tests should be unaffected.
Depends on a newer version of sdk-common, which fixes the parsing of
array resource in value files.
Bug:
12372031
Change-Id: I313b61511e98ac1402d75056ebfdeeb005ebb96d
(cherry picked from commit
642cff50f8f7a67eed09eac1e56d7133b26a192c)
Deepanshu Gupta [Fri, 22 May 2015 21:11:22 +0000 (14:11 -0700)]
LayoutLib: Change nullity annotations. [DO NOT MERGE]
Switch from using tools nullity annotations (com.android.annotations)
to android framework annotations (android.annotation).
A new sdk-common prebuilt is required for LayoutLib tests. The new
sdk-common requires an updated tools-common. The updated tools-common
doesn't have nullity annotations. So, instead of adding the annotation
dependency, just reuse the platform ones. This also paves the way to
include other platform annotations like IdRes etc.
Change-Id: I87b8f767d3681d914abe7d1329e26a87f49f50a7
(cherry picked from commit
476e582d2ffdf25102d4c55f8c242baa3d21d37f)
Deepanshu Gupta [Thu, 21 May 2015 18:47:36 +0000 (11:47 -0700)]
Add documentation about hack in commit:
f8ea750455 [DO NOT MERGE]
Change-Id: I9ce871a67fb67e02e0c4df1eb5c3261ea52a914b
(cherry picked from commit
6330971ed293a2777bbdab09288f90ea4b2d0255)
Deepanshu Gupta [Mon, 24 Aug 2015 20:50:18 +0000 (13:50 -0700)]
Make DatePicker rendering not fail (style search fix). [DO NOT MERGE]
Only cherry picked for the style not found fix.
Change-Id: Ied2b71de5b32bcb640bf4ec445e8a39509f800e9
(cherry picked from commit
d5b82845450beac2d3c7db9cd80e9fc34d43a297)
Deepanshu Gupta [Wed, 20 May 2015 21:51:37 +0000 (14:51 -0700)]
Inject anonymous inner classes of injected classes [DO NOT MERGE]
When injecting classes in LayoutLib (eg. CreateInfo), so that LayoutLib
can refer back to the changes, also inject the anonymous inner classes.
Without this, the injected classes are not loadable. Although, LayoutLib
itself doesn't load these classes, but some tests do.
Change-Id: Ib5f6b779ef4d79dec8d614d3dbb26eeac88a1064
(cherry picked from commit
bfc9c3bcbe3b7056d3330f754811c1506f181b88)
Deepanshu Gupta [Wed, 20 May 2015 18:28:50 +0000 (11:28 -0700)]
Update platformDir search in tests. [DO NOT MERGE]
When trying to find the SDK Platform Dir for LayoutLib tests, also
test if the dir from which the tests are run is module dir.
Change-Id: Id5c6038d07ebbb122e38f907ad488ed1f2bcde32
(cherry picked from commit
612a05e7e15184b21437731b9aa5db2d1d4fc54c)
Deepanshu Gupta [Tue, 19 May 2015 01:47:07 +0000 (18:47 -0700)]
Make Context.getClassLoader() work. [DO NOT MERGE]
Context.getClassLoader() is used by the LayoutInflater and can be used
by custom views. However, when called from the LayoutInflater, this
needs to return only the Framework classes. This is so that the IDE gets
a chance to instantiate the custom views, which helps in better error
reporting and better fallback in case of exceptions, like MockView.
To workaround this need of the same method returning different results
based on where it's called from, the method call in LayoutInflater is
renamed to getFrameworkClassLoader() and the new method is injected in
Context. The implementation of getFrameworkClassLoader() maintains the
existing behaviour of getClassLoader().
Context.getClassLoader() is now modified to return classes from both
Framework and the app namespace.
Also, update the list of packages to search for Framework views.
Change-Id: I1a6be4aa1fc5c1c5520b5440a348a52f10b6eb3b
(cherry picked from commit
f8ea750455eec81e4e6d877b3e18e29a86d4ec95)
Deepanshu Gupta [Tue, 19 May 2015 18:55:15 +0000 (11:55 -0700)]
Fix include tag rendering. [DO NOT MERGE]
A missing catch clause caused rendering to be failed when there is an
include tag that doesn't specify layout_width and layout_height. Also
improve the error messages to make debugging easier next time.
Change-Id: I617762636973a010b34da167c7b5fcd328b7d178
(cherry picked from commit
21b564573327b1ed2f7e06146b8a01c47ede3089)
Deepanshu Gupta [Mon, 18 May 2015 21:39:03 +0000 (14:39 -0700)]
Show better error message for color attr not found. [DO NOT MERGE]
Change-Id: I1ca32989522d30fec336eb607ee81f9e5cb5f48f
(cherry picked from commit
5f1bf496948fb6383ae17e5467a26a00489d7564)
Deepanshu Gupta [Fri, 15 May 2015 00:00:50 +0000 (17:00 -0700)]
Fix build: udpate parser factory method [DO NOT MERGE]
Change-Id: I78ad55bc924427b44451ec32fbd1032d6cd77544
(cherry picked from commit
3dc19883c571a829c36aa603c04a55c91b00dd57)
Deepanshu Gupta [Thu, 14 May 2015 22:37:29 +0000 (15:37 -0700)]
Don't keep LayoutlibCallback reference. [DO NOT MERGE]
Switch to the newer API that enables keeping a reference only to the
ParserFactory which is a much leaner object as compared to
LayoutlibCallback.
Conflicts:
tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/android/BridgeXmlBlockParserTest.java
Change-Id: I9b7afd93226db23786a00b2951cbf5ae5b8f3e5f
(cherry picked from commit
f2d408b51debadca830eefbf8131185ac55ce699)
Deepanshu Gupta [Sat, 9 May 2015 20:09:22 +0000 (13:09 -0700)]
Remove kxml dependency [DO NOT MERGE]
Create XmlPullParser using callback provided by the client. This enables
clients to choose which XmlPullParser implementation they want.
Change-Id: I9ad97a4777820cdbe5c8fc3716f74ddec9065c70
(cherry picked from commit
78af25584633462e4ab8cf9bafe10f43e7cb2d83)
Chien-Yu Chen [Tue, 25 Aug 2015 18:31:58 +0000 (11:31 -0700)]
Camera: Update for reprocess session
Document that some devices may not support submitting multiple
outputs in a single reprocess capture requests. Remove the
guaranteed reprocess session configurations that are less common
and may not be supported by all devices.
Bug:
23422291
Change-Id: I1c869612e9a83ef480113ca2628f68511a150b64
Nicholas Sauer [Tue, 25 Aug 2015 15:47:50 +0000 (08:47 -0700)]
Add GET_APP_OPS_STATS to Shell
bug:
23397072
Change-Id: I9f60f175380048e0f3888d866069f8f76166c732
Nicolas Prevot [Tue, 25 Aug 2015 12:01:43 +0000 (13:01 +0100)]
Don't set a null filter to a cross-profile ResolveInfo.
ResolverActivity expects the filter not to be null.
BUG:
23395395
Change-Id: Ie7081daba1ad138b1a3903ef9dd1b649806c8d0e
Eino-Ville Talvala [Mon, 24 Aug 2015 23:08:00 +0000 (23:08 +0000)]
Merge "Camera2: Remove filtering for non-BURST_CAPTURE-capable devices" into mnc-dev
Eino-Ville Talvala [Mon, 24 Aug 2015 21:06:12 +0000 (14:06 -0700)]
Camera2: Remove filtering for non-BURST_CAPTURE-capable devices
Devices that do not support the BURST_CAPTURE capability do not
get the split resolution lists. However, one spot in the stream
configuration map enumeration did not guard against this properly.
As a result, the category of devices that are not-BURST-CAPABLE and
do list resolutions that operate at a 'slow' (<= 20fps) rates cause
an assert to fire from an apparently-inconsistent size list.
Guard the filtering correctly, to correctly support such
devices.
Bug:
23489536
Change-Id: Ib026f6555c69b7fac0cd1ea5027d598644cd8701
Adrian Roos [Mon, 24 Aug 2015 20:39:11 +0000 (13:39 -0700)]
Fix shifted wallpaper after OTA
Fixes a bug where WindowManager's and SurfaceFlinger's
view of the wallpaper's position could get out of sync.
Bug:
13020924
Change-Id: Iad17b0f516fffacd2877ceac40fcc8e2647c06b2
Joe Fernandez [Mon, 24 Aug 2015 20:25:04 +0000 (20:25 +0000)]
Merge "docs: Add Studio 1.3.2 release notes and download links" into mnc-dev
Joe Fernandez [Fri, 21 Aug 2015 00:11:56 +0000 (17:11 -0700)]
docs: Add Studio 1.3.2 release notes and download links
- Added Studio 1.3.2 release notes
- Added Studio 1.3.2 download link information
- Added ADT 23.0.7 release notes (catch up from 8/17)
Change-Id: I930059d9bf85f7063eb3f55e0c77d46a064c75b0
Scott Main [Mon, 24 Aug 2015 16:34:35 +0000 (16:34 +0000)]
Merge "add placeholder for platform name in download button. This change depends on the following change to the script that loads the platform name... https://googleplex-android-review.git.corp.google.com/#/c/752776/" into mnc-dev
Eino-Ville Talvala [Sat, 22 Aug 2015 05:33:26 +0000 (05:33 +0000)]
Merge "Camera2: Legacy: Lock down surface sizes before creating EGL surfaces" into mnc-dev
Andrew Solovay [Sat, 22 Aug 2015 00:30:59 +0000 (00:30 +0000)]
Merge "docs: Fix return info for support lib checkSelfPermission()" into mnc-dev
Eino-Ville Talvala [Sat, 22 Aug 2015 00:14:13 +0000 (00:14 +0000)]
Merge "Camera: Fix depth documentation issues" into mnc-dev
Eino-Ville Talvala [Fri, 21 Aug 2015 23:30:27 +0000 (16:30 -0700)]
Camera2: Legacy: Lock down surface sizes before creating EGL surfaces
This ensures that sizes don't change after being initially inspected,
and/or stale size information isn't reused incorrectly.
Bug:
22092273
Change-Id: I5b26ea53977da4c1412e476d06d94aa791846393
Glenn Kasten [Fri, 21 Aug 2015 23:27:08 +0000 (23:27 +0000)]
Merge "MIDI docs: fix buffer allocation" into mnc-dev
Cheryl Potter [Fri, 21 Aug 2015 23:08:00 +0000 (23:08 +0000)]
am
251f2479: am
dc35d48f: Merge "docs: changed red to yellow in code snippet" into mnc-preview-docs
* commit '
251f24790757cf38bffbd6cec06c6503f99299dd':
docs: changed red to yellow in code snippet
Fyodor Kupolov [Fri, 21 Aug 2015 23:04:09 +0000 (23:04 +0000)]
Merge "Fixed a typo in convertRestrictionsToBundle JavaDoc" into mnc-dev
Cheryl Potter [Fri, 21 Aug 2015 23:01:17 +0000 (23:01 +0000)]
am
dc35d48f: Merge "docs: changed red to yellow in code snippet" into mnc-preview-docs
* commit '
dc35d48f4fdc2016f900207ebc934e5a57bd9265':
docs: changed red to yellow in code snippet
Cheryl Potter [Fri, 21 Aug 2015 22:51:30 +0000 (22:51 +0000)]
Merge "docs: changed red to yellow in code snippet" into mnc-preview-docs
Jim Miller [Fri, 21 Aug 2015 21:59:51 +0000 (21:59 +0000)]
Merge "Fix type-o in FingerprintManager documentation" into mnc-dev
Fyodor Kupolov [Fri, 21 Aug 2015 18:25:55 +0000 (11:25 -0700)]
Fixed a typo in convertRestrictionsToBundle JavaDoc
Bug:
23408097
Change-Id: Ie06c33aa7b9a953dec645d1763e27dcb506764f0
Svetoslav Ganov [Fri, 21 Aug 2015 12:34:37 +0000 (12:34 +0000)]
Merge "Add missing removed permissions to the platform manifest" into mnc-dev
Sebastien Hertz [Fri, 21 Aug 2015 11:10:18 +0000 (11:10 +0000)]
am
852c6178: (-s ours) am
b63e291d: am
88556ac2: am
599dc2bd: am
50af68e7: am
55f86b18: (-s ours) am
9e7a0ddb: am
18089ceb: Allow debugging only for apps forked from zygote DO NOT MERGE
* commit '
852c6178629d3bdcd7d2c958379b0b71539f460f':
Allow debugging only for apps forked from zygote DO NOT MERGE
Sebastien Hertz [Fri, 21 Aug 2015 11:02:27 +0000 (11:02 +0000)]
am
b63e291d: am
88556ac2: am
599dc2bd: am
50af68e7: am
55f86b18: (-s ours) am
9e7a0ddb: am
18089ceb: Allow debugging only for apps forked from zygote DO NOT MERGE
* commit '
b63e291d05aa9522b2ef9b399936c52079820c3f':
Allow debugging only for apps forked from zygote DO NOT MERGE
Sebastien Hertz [Fri, 21 Aug 2015 10:53:07 +0000 (10:53 +0000)]
am
88556ac2: am
599dc2bd: am
50af68e7: am
55f86b18: (-s ours) am
9e7a0ddb: am
18089ceb: Allow debugging only for apps forked from zygote DO NOT MERGE
* commit '
88556ac22157ddfe154be6ee7c8853e0a81dc83c':
Allow debugging only for apps forked from zygote DO NOT MERGE
Sebastien Hertz [Fri, 21 Aug 2015 10:37:46 +0000 (10:37 +0000)]
am
599dc2bd: am
50af68e7: am
55f86b18: (-s ours) am
9e7a0ddb: am
18089ceb: Allow debugging only for apps forked from zygote DO NOT MERGE
* commit '
599dc2bd1c809ae5a413fc3800fc3fbb71432de6':
Allow debugging only for apps forked from zygote DO NOT MERGE
Sebastien Hertz [Fri, 21 Aug 2015 10:29:30 +0000 (10:29 +0000)]
am
50af68e7: am
55f86b18: (-s ours) am
9e7a0ddb: am
18089ceb: Allow debugging only for apps forked from zygote DO NOT MERGE
* commit '
50af68e74a756d0fc81eda2a3580dbcf70362d42':
Allow debugging only for apps forked from zygote DO NOT MERGE
Sebastien Hertz [Fri, 21 Aug 2015 10:18:38 +0000 (10:18 +0000)]
am
55f86b18: (-s ours) am
9e7a0ddb: am
18089ceb: Allow debugging only for apps forked from zygote DO NOT MERGE
* commit '
55f86b1811f0411a5d685d6c97772b846a706e19':
Allow debugging only for apps forked from zygote DO NOT MERGE
Sebastien Hertz [Fri, 21 Aug 2015 10:09:22 +0000 (10:09 +0000)]
am
9e7a0ddb: am
18089ceb: Allow debugging only for apps forked from zygote DO NOT MERGE
* commit '
9e7a0ddb65ad0bd04d49a24a68aa96730b2ba9a1':
Allow debugging only for apps forked from zygote DO NOT MERGE
Sebastien Hertz [Fri, 21 Aug 2015 09:50:24 +0000 (09:50 +0000)]
am
18089ceb: Allow debugging only for apps forked from zygote DO NOT MERGE
* commit '
18089ceb71ad4ce2332096b8e7b5f8c1f8e263db':
Allow debugging only for apps forked from zygote DO NOT MERGE
Sebastien Hertz [Fri, 21 Aug 2015 09:49:11 +0000 (09:49 +0000)]
am
b60bc0ec: resolved conflicts for merge of
a2d19318 to lmp-mr1-ub-dev
* commit '
b60bc0ece2b2714845eff37c97cb19d41a308122':
Allow debugging only for apps forked from zygote
Sebastien Hertz [Fri, 21 Aug 2015 07:53:41 +0000 (09:53 +0200)]
resolved conflicts for merge of
a2d19318 to lmp-mr1-ub-dev
Change-Id: I4cb38241b5efab1eb7af161e1589fa477a473a39
Sebastien Hertz [Fri, 21 Aug 2015 07:19:10 +0000 (07:19 +0000)]
am
87a786af: am
445ab7fa: am
ff8dc212: Allow debugging only for apps forked from zygote
* commit '
87a786afdba8ec94036c62fb58265d364a7064ae':
Allow debugging only for apps forked from zygote
Sebastien Hertz [Fri, 21 Aug 2015 07:08:43 +0000 (07:08 +0000)]
am
445ab7fa: am
ff8dc212: Allow debugging only for apps forked from zygote
* commit '
445ab7fa43f32ac1a256b15f5ab2bd619e9711e4':
Allow debugging only for apps forked from zygote
OSDN Git Service
