Commit Graph

49937 Commits

Author SHA1 Message Date
Andreas Gampe
2c1078fbbd resolved conflicts for merge of b6d6c04a to master
Change-Id: I5286b9fe2d9bde4b219496e593cf028cc4c75bc7
2015-03-10 15:45:36 -07:00
Chris Craik
1d21dc22e2 Merge "Add several CallSupers to View" 2015-03-10 22:02:24 +00:00
Svetoslav
dbbeeb3f44 Remove unused settings constants from the SDK (framework).
The settings constants for various volumes do nothing and are
used by nothing since API version 2. These are however backed
up in the cloud which is a waste of resource. This change
removes these constants from the SDK while keeping them hidden
to avoid breaking released apps and also prevents unnecessary
backup.

Change-Id: I2e91863115f5a4b997a14f8d0f57b4dc9689cfab
2015-03-10 19:53:12 +00:00
dcashman
86bb9ba586 am 4c887ac9: am db7fa51f: am c7446790: Merge "ZygoteConnection: remove obsolete security checks."
* commit '4c887ac9318402b914dbee4462485006395bdfbe':
  ZygoteConnection: remove obsolete security checks.
2015-03-10 18:15:54 +00:00
Sander Alewijnse
94ac7556a6 Merge "Do not show toast when forwarding from resolver activity to itself." 2015-03-10 17:51:59 +00:00
Makoto Onuki
d5800c0682 Merge "Cache photo URI too in calllog (contract)" 2015-03-10 17:49:32 +00:00
James Cook
2a914cb3ae Merge "Handle undo in TextView fields with no cursor" 2015-03-10 17:42:48 +00:00
James Cook
900185d003 Handle undo in TextView fields with no cursor
This fixes a rare crash in the undo system. In particular, if the
TextView did not have a cursor and the first operation was a
programmatic insert/append the "old cursor position" would be -1.
Attempting to undo would try to restore the cursor to -1 and crash.

Test will land separately in CTS.

Bug: 19332904
Change-Id: I9aa18c1e3621b99d13ac707e483154382effb81c
2015-03-10 10:25:26 -07:00
Alan Viverette
7d6bc4f022 Merge "Revert RelativeLayout's baseline view to API 22 and below behavior" 2015-03-10 17:19:53 +00:00
Chris Craik
a57e9365ca Add several CallSupers to View
Change-Id: I3011bd9757273f9c1d35f552bd6fefd4bf830029
2015-03-10 10:12:55 -07:00
Sander Alewijnse
053d3ddd40 Do not show toast when forwarding from resolver activity to itself.
Bug:19540802
Change-Id: I99409aab42bdbf187c07a345ca5c404e88a4c918
2015-03-10 16:37:53 +00:00
Chris Craik
ddd72599bf Merge "Rename and simplify DisplayList Canvas classes" 2015-03-10 16:29:01 +00:00
Andreas Gampe
b6d6c04a71 am 174a4488: am 7f383873: Merge "Frameworks/base: Pass APK debugability to installd"
* commit '174a44888ec56f688426c80d50b9e0021f47c16f':
  Frameworks/base: Pass APK debugability to installd
2015-03-10 15:11:56 +00:00
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
Andreas Gampe
174a44888e am 7f383873: Merge "Frameworks/base: Pass APK debugability to installd"
* commit '7f383873566024c7121cadae3bbdd2a7c47150bc':
  Frameworks/base: Pass APK debugability to installd
2015-03-10 02:10:22 +00:00
Chris Craik
c9070ebd13 Rename and simplify DisplayList Canvas classes
Change-Id: I49fd2ce02e01401209fe2a378e9f9547c7b27c61
2015-03-09 19:09:55 -07: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
Alan Viverette
0e14a85768 Revert RelativeLayout's baseline view to API 22 and below behavior
The previous behavior used the top-start-most view, rather than the view
with the bottom-most baseline. Which doesn't really make sense, but
that's what it did.

Bug: 19653790
Change-Id: Ia23476f1d2de5313fd82aac037e90d45b0af8972
2015-03-09 18:01:19 -07: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
Alan Viverette
b5c4623b7f Merge "Copy ViewPager and PagerAdapter into framework-internal widgets" 2015-03-10 00:22:39 +00: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
75fd8f9fdc Copy ViewPager and PagerAdapter into framework-internal widgets
Converted all compat references to native implementations. Removed all
backwards compatibility SDK version checks.

Bug: 19431364
Change-Id: Ia79ed65bd2d041e4c0de6839b64707b9dba3ac22
2015-03-09 15:51:10 -07: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
Andreas Gampe
7f38387356 Merge "Frameworks/base: Pass APK debugability to installd" 2015-03-09 22:14:54 +00:00
dcashman
4c887ac931 am db7fa51f: am c7446790: Merge "ZygoteConnection: remove obsolete security checks."
* commit 'db7fa51ff0f330b79b171f03b4304a75affaabce':
  ZygoteConnection: remove obsolete security checks.
2015-03-09 20:58:54 +00:00
Makoto Onuki
edb8450b56 Cache photo URI too in calllog (contract)
Enterprise phone lookup returns special photo URLs for corp contacts, which
can't be obtained just with contact IDs.  So we need to cache the URIs too and
otherwise pictures sometimes don't show up.

Bug 19546108

Change-Id: Iffd5ed16527a143ea55e40e42667e7d0c16d814a
2015-03-09 13:57:02 -07:00
dcashman
db7fa51ff0 am c7446790: Merge "ZygoteConnection: remove obsolete security checks."
* commit 'c74467902b5a9a7267b6cb8f30b364b8373eac72':
  ZygoteConnection: remove obsolete security checks.
2015-03-09 20:51:33 +00:00
Dianne Hackborn
442361c500 Merge "Battery stats issues: fix jiffy handling, print scan counts." 2015-03-09 20:36:58 +00:00
dcashman
fc4c0bf8bc ZygoteConnection: remove obsolete security checks.
SELinux guarantees that only the system_server and permissive domains such as su
are allowed to connect to the zygote socket. Remove obsolete security checks
that were only applicable when other processes could connect.

Bug: 19624279
Change-Id: I1c925d7facf19b3953b5deb85d992415344c4c9f
2015-03-09 12:37:08 -07: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
Andreas Gampe
735600c1e6 Frameworks/base: Pass APK debugability to installd
Change-Id: Id17ec72babe2ee88713a0d274eff86508de30666
2015-03-09 08:57:23 -07: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