drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
273,413 Commits 1 Branch 0 Tags
Commit Graph

273413 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Lesinski
d0f116b619 AAPT2: Remove usage of u16string 
For legacy reasons, we kept around the use of UTF-16 internally
in AAPT2. We don't need this and this CL removes all instances of
std::u16string and StringPiece16. The only places still needed
are when interacting with the ResTable APIs that only operate in
UTF16.

Change-Id: I492475b84bb9014fa13bf992cff447ee7a5fe588
 2016-07-13 17:45:28 -07:00
Kevin Gabayan
aaac91f4a0 Merge \\"Wakelock timeout for AnyMotionDetector. Bug: 29959125\\" into nyc-mr1-dev am: 33759a993d 
am: ef759ca10e

Change-Id: Id0f533b0a913633b364a200832518f3535da856e
 2016-07-13 00:34:55 +00:00
Vladislav Kaznacheev
0617e168cb Merge \"Fix docs for View.DRAG_FLAG_GLOBAL am: 9a44eaec53 am: 8496bb82d2\" into nyc-mr1-dev-plus-aosp 
am: f7d96e5557

Change-Id: Iffb3086a366f99246510e79e489e5d30ae11ec78
 2016-07-13 00:34:52 +00:00
Kevin Gabayan
ef759ca10e Merge \"Wakelock timeout for AnyMotionDetector. Bug: 29959125\" into nyc-mr1-dev 
am: 33759a993d

Change-Id: I9ca9b5835b0fbddca4447fcb8e6fc606880bf69e
 2016-07-13 00:27:14 +00:00
Vladislav Kaznacheev
04e15b8a23 Fix docs for View.DRAG_FLAG_GLOBAL am: 9a44eaec53 am: 9ac6a460c8 
am: 9c225d60e0

Change-Id: I5876ea6cfe8e1711f446c9f9246770ff49fb7380
 2016-07-13 00:27:07 +00:00
Android Build Merger (Role)
f7d96e5557 Merge "Fix docs for View.DRAG_FLAG_GLOBAL am: 9a44eaec53 am: 8496bb82d2" into nyc-mr1-dev-plus-aosp 2016-07-13 00:18:23 +00:00
Vladislav Kaznacheev
e13ac1898c Fix docs for View.DRAG_FLAG_GLOBAL am: 9a44eaec53 
am: 8496bb82d2

Change-Id: Ia9b23c5412d44197ca0403f693931bf64e5c4790
 2016-07-13 00:18:00 +00:00
Vladislav Kaznacheev
9c225d60e0 Fix docs for View.DRAG_FLAG_GLOBAL am: 9a44eaec53 
am: 9ac6a460c8

Change-Id: I62af5eba6621e25c51cbcbfe7f9670e7be1449a3
 2016-07-13 00:17:39 +00:00
Kevin Gabayan
33759a993d Merge "Wakelock timeout for AnyMotionDetector. Bug: 29959125" into nyc-mr1-dev 2016-07-13 00:14:22 +00:00
Vladislav Kaznacheev
8496bb82d2 Fix docs for View.DRAG_FLAG_GLOBAL 
am: 9a44eaec53

Change-Id: I4b0548a4fb7bff0312d2cd73217f64f361216c50
 2016-07-13 00:08:52 +00:00
Vladislav Kaznacheev
9ac6a460c8 Fix docs for View.DRAG_FLAG_GLOBAL 
am: 9a44eaec53

Change-Id: I82786f107815361b73655b92dc4e54ee255296d9
 2016-07-13 00:08:50 +00:00
Dianne Hackborn
4d3853e3ad Merge \\"Fix issue #30013670: Phone AP crash when testing VT call\\" into nyc-mr1-dev am: ab1b52a0c4 
am: aa055e7f2d

Change-Id: I8b27b4e09bb563fe8088f49415eb2e06720ac522
 2016-07-12 23:47:26 +00:00
Chris Thornton
c7777df526 Merge \\"SoundTriggerDetector should look at the return code to honour success\\" into nyc-mr1-dev am: 9b550cb188 
am: 0359337b9b

Change-Id: Idabd2180b88dbb8cef6039825cdebaf3026eaf8d
 2016-07-12 23:47:23 +00:00
Fyodor Kupolov
2c67d6f6c9 Merge \\"Move grantDefaultPermissions back to onNewUserCreated\\" into nyc-mr1-dev am: 9cf5bf04d2 
am: 6d2170ee5d

Change-Id: I047b104b2f1735c072e636ccfe366de411e3204c
 2016-07-12 23:47:20 +00:00
Kevin Gabayan
dcf4701d37 Wakelock timeout for AnyMotionDetector. 
Bug: 29959125

Change-Id: I7260fd1640b87884bb550ff428eb9cd1dc111512
 2016-07-12 16:46:11 -07:00
Dianne Hackborn
aa055e7f2d Merge \"Fix issue #30013670: Phone AP crash when testing VT call\" into nyc-mr1-dev 
am: ab1b52a0c4

Change-Id: I8c707c615ce3e74cd51db321581c0e7e123c0d95
 2016-07-12 23:37:25 +00:00
Chris Thornton
0359337b9b Merge \"SoundTriggerDetector should look at the return code to honour success\" into nyc-mr1-dev 
am: 9b550cb188

Change-Id: Iafbd6b758768fc0f87651ac9086333fa74e07fdc
 2016-07-12 23:37:18 +00:00
Fyodor Kupolov
6d2170ee5d Merge \"Move grantDefaultPermissions back to onNewUserCreated\" into nyc-mr1-dev 
am: 9cf5bf04d2

Change-Id: Id776e0b5f87bf5325a9bc48e198d168c9c555c18
 2016-07-12 23:37:08 +00:00
Dianne Hackborn
ab1b52a0c4 Merge "Fix issue #30013670: Phone AP crash when testing VT call" into nyc-mr1-dev 2016-07-12 23:28:38 +00:00
Raph Levien
affb21fb45 Merge "Don't count zero width space in hasGlyph layout" 2016-07-12 23:26:17 +00:00
Raph Levien
3ccee3a13e Merge "Patch out part of the emoji tests." 2016-07-12 23:26:00 +00:00
Chris Thornton
9b550cb188 Merge "SoundTriggerDetector should look at the return code to honour success" into nyc-mr1-dev 2016-07-12 23:24:41 +00:00
TreeHugger Robot
9cf5bf04d2 Merge "Move grantDefaultPermissions back to onNewUserCreated" into nyc-mr1-dev 2016-07-12 23:22:46 +00:00
Todd Kennedy
723e10c4a9 Merge \\"Don\\'t hold lock calling into PackageMgr\\" into nyc-mr1-dev am: c8967160aa 
am: b5a2e31e57

Change-Id: I53f9fa9aed56ff9307894a8fa07ca337f2e41e0f
 2016-07-12 23:09:18 +00:00
Chris Tate
f9819ce2fa Merge \\"Explicitly flush compress/encrypt stream before close\\" into nyc-mr1-dev am: 69818781f3 
am: 0d99301cb4

Change-Id: Ie0a3a2b93d30278a94893c3b513befaa5edf32ca
 2016-07-12 23:04:06 +00:00
Todd Kennedy
b5a2e31e57 Merge \"Don\'t hold lock calling into PackageMgr\" into nyc-mr1-dev 
am: c8967160aa

Change-Id: I9e4faf9115c35a7d2995ddc5ad82ed12df6f2a9b
 2016-07-12 23:03:39 +00:00
Christopher Tate
0d99301cb4 Merge \"Explicitly flush compress/encrypt stream before close\" into nyc-mr1-dev 
am: 69818781f3

Change-Id: Ib31ffe531a4c6d27f10d1432c8ab68507c14abaf
 2016-07-12 22:58:27 +00:00
TreeHugger Robot
c8967160aa Merge "Don't hold lock calling into PackageMgr" into nyc-mr1-dev 2016-07-12 22:52:29 +00:00
Chris Tate
69818781f3 Merge "Explicitly flush compress/encrypt stream before close" into nyc-mr1-dev 2016-07-12 22:47:00 +00:00
Vladislav Kaznacheev
9a44eaec53 Fix docs for View.DRAG_FLAG_GLOBAL 
Document that cross-app drags only involve apps compiled for API 24 or later.

Bug: 30076806
Change-Id: Ia630f4623c23d787b52692ff1f6475408cefa177
 2016-07-12 15:24:48 -07:00
Makoto Onuki
83118dd723 Merge \\"Don\\'t backup & restore disabled shortcuts.\\" into nyc-mr1-dev am: 4885b274c1 
am: bc15e3ca2b

Change-Id: I457db12fdcc884a121b82320b7d32646133632ca
 2016-07-12 22:20:06 +00:00
Makoto Onuki
bc15e3ca2b Merge \"Don\'t backup & restore disabled shortcuts.\" into nyc-mr1-dev 
am: 4885b274c1

Change-Id: I23c46fa144ac1b4989a4cd93cf442b812c7d1324
 2016-07-12 22:11:54 +00:00
Makoto Onuki
4885b274c1 Merge "Don't backup & restore disabled shortcuts." into nyc-mr1-dev 2016-07-12 22:01:08 +00:00
TreeHugger Robot
af72929151 Merge "Pull clipping related classes to a separate package." 2016-07-12 21:58:24 +00:00
Fyodor Kupolov
5fd967d263 Move grantDefaultPermissions back to onNewUserCreated 
Otherwise pre-grants may not work on managed profiles because apps could be
uninstalled when the user is started

Bug: 29955102
Change-Id: I8fafaf1ca6193c1a13bd2f0b463ee30fe473e6b5
 2016-07-12 14:46:19 -07:00
Wale Ogunwale
23a3d9ca5f Merge \\"Do remove starting windows for activities in an invisible stack\\" into nyc-mr1-dev am: 1ae277831d 
am: d0c3bc327d

Change-Id: I1887cfae7a32817dc8ef4f87eec20496e8e5aa81
 2016-07-12 21:43:51 +00:00
Wale Ogunwale
d0c3bc327d Merge \"Do remove starting windows for activities in an invisible stack\" into nyc-mr1-dev 
am: 1ae277831d

Change-Id: If0e30f9f03a499d9ff5613268e2ea3311476ab3c
 2016-07-12 21:38:22 +00:00
TreeHugger Robot
1ae277831d Merge "Do remove starting windows for activities in an invisible stack" into nyc-mr1-dev 2016-07-12 21:32:39 +00:00
Wale Ogunwale
98742a5871 Do remove starting windows for activities in an invisible stack 
Depending on app launch timing it is possible for the initializing
activity that is the top of an invisible stack to still have its
starting window visible since we skip removing orphaned starting
window for the top activity in a stack. We now remove starting
windows for all activities in an invisible stack.

Bug: 28173906
Change-Id: Ie5284c9681d06969f647cbe46a77dd072ca61435
 2016-07-12 14:29:22 -07:00
Rob Carr
5ddb26eace Merge "Remove unused SurfaceView state." 2016-07-12 21:20:02 +00:00
Chris Tate
2906c208c7 Merge \\"Harden framework against backup transport crashes\\" into nyc-mr1-dev am: 1165790f70 
am: 77f5ea02a5

Change-Id: If83f16847ddded66ed3d462ffb45016187bcae7f
 2016-07-12 21:14:09 +00:00
Christopher Tate
77f5ea02a5 Merge \"Harden framework against backup transport crashes\" into nyc-mr1-dev 
am: 1165790f70

Change-Id: Icec9fab284cd476ffca3721d1d5f8eaaf1300ff8
 2016-07-12 21:10:10 +00:00
Todd Kennedy
04918fe027 Don't hold lock calling into PackageMgr 
There's a subtle deadlock; when dumping state, we obtain the package manager
lock before trying to obtain the package installer session lock. Meanwhile,
creating a new session obtains the locks in the reverse -- the package
installer takes the package installer session lock and then tries to obtain
the package manager lock.

Here, we avoid holding the package installer session lock before we call
into the package manager. Alternatively, we could consider not holding the
package manager lock when dumping package installer state. But, given the
scope of the dumping logic, that's a bigger change with other, unknown
side effects.

Change-Id: I11f08484cd335bb7ad3bc557808eb48d14bd29cf
Fixes: 30089638
 2016-07-12 14:07:40 -07:00
Chris Tate
1165790f70 Merge "Harden framework against backup transport crashes" into nyc-mr1-dev 2016-07-12 21:00:29 +00:00
Anthony Hugh
8a8d81633e Merge \\"Prevent back button from being handled by app after waking device\\" into nyc-mr1-dev am: 1b7c5631c4 
am: dd476c8e57

Change-Id: I367456961363134903b4df8ccbaa00f92f36e290
 2016-07-12 20:57:26 +00:00
Anthony Hugh
dd476c8e57 Merge \"Prevent back button from being handled by app after waking device\" into nyc-mr1-dev 
am: 1b7c5631c4

Change-Id: I0a0dae375e9528040483e4471d3093679a94533c
 2016-07-12 20:49:37 +00:00
Tenghui Zhu
19c6ae310c Merge "Add layout perf test into APCT" 2016-07-12 20:41:59 +00:00
Anthony Hugh
1b7c5631c4 Merge "Prevent back button from being handled by app after waking device" into nyc-mr1-dev 2016-07-12 20:39:06 +00:00
Dianne Hackborn
4d8959489d Fix issue #30013670: Phone AP crash when testing VT call 
Intent categories may be null.

Change-Id: Ic2e0438460741b264ddbfe77d2a14973f9af7d95
 2016-07-12 13:36:02 -07:00
Garfield, Tan
415cd8b846 Pull clipping related classes to a separate package. 
Change-Id: I125d1c34e475f9465e82014cb869f88c9c7cebc4
 2016-07-12 20:26:16 +00:00