Commit Graph

45951 Commits

Author SHA1 Message Date
Rubin Xu
ba4df96297 Merge "Document behavior change of isUninstallBlocked() since L MR1" 2015-03-10 12:34:57 +00:00
Rubin Xu
e1e6faad7b Document behavior change of isUninstallBlocked() since L MR1
Bug: 17914630
Change-Id: I39ee2775c104e4dca7ca583b83deef0aa0e4d1e3
2015-03-10 12:22:16 +00:00
Adam Lesinski
216f3edcb9 Merge "BatteryStats: Record energy info stats from WiFi and Bluetooth controllers" 2015-03-10 01:35:54 +00:00
Roozbeh Pournader
d1eca77c3c Merge "Fix: Drag handles are not shown for selection/insertion" 2015-03-10 01:06:03 +00:00
Adam Lesinski
33dac55935 BatteryStats: Record energy info stats from WiFi and Bluetooth controllers
Surface some of this information in BatteryStatsHelper. If we are given a
total energy from the WiFi controller, we normalize the computed
energy of each app and blame them for a fraction of the real energy.

Change-Id: I64051b600f5d9f6ac4580d56ef0977971eb4be2d
2015-03-09 17:36:13 -07:00
Eino-Ville Talvala
a72d640134 Merge "Camera2: Add hidden depth stream configuration tags" 2015-03-09 23:29:28 +00:00
Eino-Ville Talvala
7e443fbe85 Merge "Camera2: Remove unused parameters in ICameraDeviceUser#createStream" 2015-03-09 23:29:10 +00:00
Alan Viverette
f44b94c2ad Merge "Make TypedArray and LayoutInflater exceptions more useful" 2015-03-09 22:53:55 +00:00
Alan Viverette
93795053da Make TypedArray and LayoutInflater exceptions more useful
Include unresolved TypedValue data in TypedArray exceptions, wrap all
LayoutInflater exceptions with the parser position.

Bug: 19658760
Change-Id: I8965bdc4d0c58c082cb7129c3b692a3e5418cfdb
2015-03-09 15:32:50 -07:00
Adam Lesinski
488caeb702 Change WiFi and Bluetooth ActivityEnergyInfo classes
Have them take an elapsed time millis timestamp instead
of having the constructor call System.currentTimeMillis.

Change-Id: Ic9ca8f92347c336beee8ebcc3407de2c1e5b4073
2015-03-09 15:28:29 -07:00
Dianne Hackborn
442361c500 Merge "Battery stats issues: fix jiffy handling, print scan counts." 2015-03-09 20:36:58 +00:00
Dianne Hackborn
62793e4382 Battery stats issues: fix jiffy handling, print scan counts.
Issue #19431959: Framework incorrectly assumes that kernel
clock_ticks are 10ms

We now retrieve the time of a jiffy from the kernel, and all CPU
times are now handled in milliseconds.

Issue #19571810: Add per-app breakdown of number of WiFi scans
in batterystats checkin data

Added to the report (the information was already being tracked).

Change-Id: If1702d6b9bcf851704129f1811471e68ed576a5d
2015-03-09 11:15:41 -07:00
Eino-Ville Talvala
24c369e025 Camera2: Add hidden depth stream configuration tags
Change-Id: Iec1ceb894d90210bc3ab06acc92dcbbe42b74465
2015-03-09 11:15:31 -07:00
Eino-Ville Talvala
864005b026 Camera2: Remove unused parameters in ICameraDeviceUser#createStream
- width, height, format are unused

Change-Id: I26540aab1118108b0325df69cfa2dd23da41849b
2015-03-09 11:15:30 -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