Tor Norbye
5b00941a6f
Fix @ColorInt javadoc
...
Change-Id: Icea3a3b4013b4a6b5f9809eec082ea93bc26b079
2015-03-10 19:14:03 -07:00
Adrian Roos
e71a2be2ba
Merge "Revert "Remove TrustAgent whitelisting API""
2015-03-09 16:04:18 +00:00
Nicolas Prevot
6dc6876eed
Merge "Add a new extra to specify the admin component for provisioning."
2015-03-09 14:53:24 +00:00
Nicolas Prevot
1844025738
Add a new extra to specify the admin component for provisioning.
...
An app may have several device admins.
For this case, allow the caller to specify which one will become
an active device admin, and the profile owner (in the profile owner flow).
BUG:19348295
Change-Id: Ia5f995eed6c7f8933eb00d3250daa703ba6ee616
2015-03-09 14:48:04 +00:00
Benjamin Franz
f3ece36535
Block setting wallpapers from managed profiles.
...
Silently fail when a managed profile app tries to change the
wallpaper and return default values for getters in that case.
This is implemented through a new AppOp that is controlled by
a new user restriction that will be set during provisioning.
Bug: 18725052
Change-Id: I1601852617e738be86560f054daf3435dd9f5a9f
2015-03-09 10:39:21 +00:00
Tor Norbye
b3ec733bb8
Annotate methods with size and range annotations
...
Change-Id: I666861f0dfae31402b1280e9a966a583b88e2e1a
2015-03-07 20:49:19 -08:00
Tor Norbye
1c2bf03d10
Annotate return values with @CheckReturn
...
Change-Id: Icd8fb6adb591ccd7f35f2336ae716b198abf69c5
2015-03-07 20:49:18 -08:00
Tor Norbye
c615c6fc9c
Annotate methods to be called from overrides with @CallSuper
...
Change-Id: Ibc587c2aaee9f3e7f448079f72a75459fe4e15e7
2015-03-07 20:49:18 -08:00
Andreas Gampe
3aa2d01752
am 3f74f638: am 55966006: am 7a4cb563: Merge "Frameworks/base: Remove unnecessary Pattern instance"
...
* commit '3f74f6386a15d09f27dbc81edd8dd2c13e298d73':
Frameworks/base: Remove unnecessary Pattern instance
2015-03-08 00:17:54 +00:00
Andreas Gampe
967567541a
am 208e80d9: am a3d5b230: am cdc19f3f: Merge "Frameworks/base: Remove unnecessary Pattern instance"
...
* commit '208e80d931fd775de925529e0c36a34e9b7f916a':
Frameworks/base: Remove unnecessary Pattern instance
2015-03-08 00:17:47 +00:00
Andreas Gampe
3f74f6386a
am 55966006: am 7a4cb563: Merge "Frameworks/base: Remove unnecessary Pattern instance"
...
* commit '5596600697f54feb944737b7bc55df06123e6e54':
Frameworks/base: Remove unnecessary Pattern instance
2015-03-08 00:08:25 +00:00
Andreas Gampe
208e80d931
am a3d5b230: am cdc19f3f: Merge "Frameworks/base: Remove unnecessary Pattern instance"
...
* commit 'a3d5b2304cf2db03ba728d37c87ef7360c7da44f':
Frameworks/base: Remove unnecessary Pattern instance
2015-03-08 00:08:19 +00:00
Andreas Gampe
5596600697
am 7a4cb563: Merge "Frameworks/base: Remove unnecessary Pattern instance"
...
* commit '7a4cb563a29f05658760739d3bc2e70bd6342174':
Frameworks/base: Remove unnecessary Pattern instance
2015-03-07 17:13:16 +00:00
Andreas Gampe
a3d5b2304c
am cdc19f3f: Merge "Frameworks/base: Remove unnecessary Pattern instance"
...
* commit 'cdc19f3f8a20b975e8e70f4b4cce5ce2be811726':
Frameworks/base: Remove unnecessary Pattern instance
2015-03-07 17:13:09 +00:00
Scott Kennedy
6c4c58d6d9
Merge "Add more @Nullable annotations"
2015-03-07 01:34:49 +00:00
Scott Kennedy
ed2b5f8aca
Add more @Nullable annotations
...
Change-Id: I5b2935eb5e63289d80ebf9bf70741800b1c0934a
2015-03-06 17:24:58 -08:00
Andreas Gampe
7a4cb563a2
Merge "Frameworks/base: Remove unnecessary Pattern instance"
2015-03-07 01:03:14 +00:00
Dianne Hackborn
0e24f143ed
Merge "Add new debug feature to automatically create heap dumps."
2015-03-07 00:44:57 +00:00
Dianne Hackborn
b9a5e4ad30
Add new debug feature to automatically create heap dumps.
...
Not yet working, unless you turn off SELinux enforcing.
We need to update SElinux to allow the system process
to give apps access to /data/system/heapdump/javaheap.bin.
Currently watching can only be enabled through the shell,
such as:
adb shell am set-watch-heap com.android.systemui 1024
The last number is the process pss size in bytes, so this is
asking us to warn if it goes about 1K which will be all the
time.
Change-Id: I2089e5db2927afca0bf01a363c6247ee5dcb26e8
2015-03-06 16:42:03 -08:00
Andreas Gampe
055678b5fe
Frameworks/base: Remove unnecessary Pattern instance
...
Using a static Pattern in UriMatcher prevents compile-time
initialization.
It is also not efficient, as String.split has a fast path for simple
splits.
Bug: 19542228
Change-Id: Ie9e5bfe6da04c6d05ec10b1426d0cd136ef46ef2
2015-03-07 00:19:01 +00:00
Andreas Gampe
18e99c1288
Frameworks/base: Remove unnecessary Pattern instance
...
Using a static Pattern in ActivityThread prevents compile-time
initialization of ActivityThread and GestureDetector, which depends
on the former.
It is also not efficient, as String.split has a fast path for simple
splits.
Bug: 19542228
Change-Id: I5bb843c08c81e0d259bb8afafa87a8467bb1730e
2015-03-07 00:18:15 +00:00
Yigit Boyar
0c7ffe4418
Merge "Remove original movements record from GridLayout"
2015-03-07 00:09:31 +00:00
Tor Norbye
c0a1b7f9a6
Merge "Annotate ARGB integer parameters with @ColorInt"
2015-03-06 23:15:27 +00:00
Tor Norbye
376eb17e0e
Merge "Additional annotations: @CallSuper, @Keep, etc."
2015-03-06 23:08:59 +00:00
Christopher Tate
eb803aef3b
Merge "Don't back up / restore the code_cache/ directory"
2015-03-06 19:43:53 +00:00
Scott Kennedy
1592f98973
Merge "Allow attrs to be @Nullable in TextView and LinearLayout"
2015-03-06 18:45:25 +00:00
Hiroshi Yamauchi
f045198fb3
Merge "Deprecate things that rely on Debug.startAllocCounting."
2015-03-06 17:43:53 +00:00
Torne (Richard Coles)
8c1db3734f
Merge "Fix typo in WebSettings javadoc."
2015-03-06 17:25:49 +00:00
James Cook
f7e503de70
Merge "Support undo of some programmatic TextView changes"
2015-03-06 15:42:06 +00:00
Torne (Richard Coles)
2b666c96e2
Fix typo in WebSettings javadoc.
...
We accidentally repeated the same enum value twice; fixed to mention the
three values correctly.
Change-Id: Iba6a7edd8e1a5b429728056a8f56634427758c73
2015-03-06 14:20:00 +00:00
Mikhail Naganov
25e8954573
Provide better error reporting for WebView
...
Add new callbacks into WebViewClient that will provide notifications
about subresource loading errors and HTTP errors received from servers.
Bug: 19313118
Change-Id: Idb47f53ef7e72cb95f3e9b89d1e238d69e896b8b
2015-03-06 10:12:14 +00:00
Scott Kennedy
3a1fa10e13
Allow attrs to be @Nullable in TextView and LinearLayout
...
Change-Id: I46ac6cddf010e7ce59de6272c30e824104e28acb
2015-03-05 19:15:11 -08:00
Christopher Tate
a8a739f34c
Don't back up / restore the code_cache/ directory
...
Bug 19628750
Change-Id: I1f2f5e8083675bf70d17c0c143dc813ca9e04610
2015-03-05 18:31:38 -08:00
Scott Kennedy
5dc5c0aac8
Merge "Mark setAccessibilityDelegate()'s argument as @Nullable"
2015-03-06 02:31:30 +00:00
Scott Kennedy
89809a1cd4
Mark setAccessibilityDelegate()'s argument as @Nullable
...
Change-Id: I3c087e953e29e81285fc8efa4157f694eeaf075d
2015-03-05 17:49:11 -08:00
Tor Norbye
80756e3888
Annotate ARGB integer parameters with @ColorInt
...
Change-Id: I307f72a382272cf18ddb6b07d9fcb81228568d9a
2015-03-05 16:34:12 -08:00
Tor Norbye
cb59f2afb7
Additional annotations: @CallSuper, @Keep, etc.
...
These mirror the new support library annotations, but
with source retention.
Change-Id: Ib85ceeb37d596aae8cf12d4f8fede3982552d033
2015-03-05 16:34:11 -08:00
John Reck
0affc5f3eb
Merge "Cleanup Bitmap JNI attempt #2 "
2015-03-05 23:55:14 +00:00
Julia Reynolds
2482100fed
Merge "Allow device and profile owners to set a user icon."
2015-03-05 23:39:04 +00:00
Yigit Boyar
38d909a57d
Fix build. getAlingment should not be public
...
Change-Id: I4abde1ddc78367795601215106388d6eb535cbca
2015-03-05 22:40:06 +00:00
Yigit Boyar
fbd9997e68
Remove original movements record from GridLayout
...
Change-Id: Iebb761d0195b9d123dada1262090a71c4c175c5e
2015-03-05 22:20:12 +00:00
Yigit Boyar
6dafd87fb4
Fix some weight bugs in grid layout
...
This CL also changes how GONE views are considered.
Previously, they would still participate in weight calculations.
Now, they are ignored.
Bug: 19546781
Sub bugs:
Bug: 19571249
Bug: 19571653
Bug: 19571319
Bug: 19571841
Change-Id: I7344f757d3a76be98bb92660f07d2a0cafa9ac12
2015-03-05 22:01:14 +00:00
John Reck
f4faeac352
Cleanup Bitmap JNI attempt #2
...
Original version missed a spot
This reverts commit c02977e3bb .
Change-Id: I56244ce10d709fcdef42a001fe4c6ba7b6bbb04d
2015-03-05 13:56:16 -08:00
Raph Levien
560a433c44
Merge "Add JNI StaticLayout.Builder"
2015-03-05 21:26:32 +00:00
Chad Jones
b9a468eb19
Merge "Revert "Cleanup Bitmap JNI""
2015-03-05 19:35:15 +00:00
Chad Jones
c02977e3bb
Revert "Cleanup Bitmap JNI"
...
This reverts commit b2915245b7 .
Change-Id: Idd7d7f33eec4ea5024c83de6b10d3d1a6ab2b17a
2015-03-05 19:34:26 +00:00
Brian Attwell
54b804fa74
Merge "Prioritize regular names over phonetic names. P1"
2015-03-05 19:26:36 +00:00
Adrian Roos
b37f518205
Revert "Remove TrustAgent whitelisting API"
...
This reverts commit bc4f2ccf6c
and re-enables the API for MNC.
Bug: 19461292
Change-Id: I53b94bacb6a879fcc0598edfc0f3d44a9dd9e84c
2015-03-05 19:26:07 +00:00
Hiroshi Yamauchi
172da26d45
Deprecate things that rely on Debug.startAllocCounting.
...
android.os.Debug.startAllocCounting() is deprecated but other things
that rely on it or do not make sense without it aren't deprecated.
Bug: 8241521
Change-Id: Ib769cb8f4e96f41ed310e17e7345acb2a630a076
2015-03-05 11:22:37 -08:00
John Reck
35da7d904b
Merge "Cleanup Bitmap JNI"
2015-03-05 18:12:35 +00:00