Commit Graph

51211 Commits

Author SHA1 Message Date
Tor Norbye
6de5f43986 Merge "Add permission annotations to the Browser" 2015-04-24 17:08:11 +00:00
Nicolas Prevot
7defaef1bf Merge "Restrict setting the profile/device owner with a signature-level permission." 2015-04-24 15:08:02 +00:00
Nicolas Prevot
2806374f95 Restrict setting the profile/device owner with a signature-level permission.
Create the new permission MANAGE_PROFILE_OWNERS to restrict setting
the profile/device owner.

BUG:19838376

Change-Id: Ib55a2db85fcb6f34e3b88c398683bddb0ad66868
2015-04-24 11:36:52 +01:00
Keisuke Kuroyanagi
0591651a62 Quit showing "SELECT ALL" for inappropriate fields.
This blocks showing "SELECT ALL" in FloatingToolBar when
the input is empty or the field is a password field.

Bug: 20407551
Change-Id: Ia25700bbee4f78445776af46eb1369af6600d946
2015-04-24 19:10:50 +09:00
Gustav Sennton
f2953dadbb Merge "Add system API method for loading webview library from another package." 2015-04-24 09:27:19 +00:00
Abodunrinwa Toki
e7d575d860 Merge "TextView: Invalidate ActionMode content rect on scroll." 2015-04-24 06:55:19 +00:00
Jeff Sharkey
620b32b316 Package and storage movement callbacks.
Since package and primary storage movement can take quite awhile,
we want to have SystemUI surface progress and allow the Settings
app to be torn down while the movement proceeds in the background.

Movement requests now return a unique ID that identifies an ongoing
operation, and interested parties can observe ongoing progress and
final status.  Internally, progress and status are overloaded so
the values 0-100 are progress, and any values outside that range
are terminal status.

Add explicit constants for special-cased volume UUIDs, and change
the APIs to accept VolumeInfo to reduce confusion.  Internally the
UUID value "null" means internal storage, and "primary_physical"
means the current primary physical volume.  These values are used
for both package and primary storage movement destinations.

Persist the current primary storage location in MountService
metadata, since it can be moved over time.

Surface disk scanned events with separate volume count so we can
determine when it's partitioned successfully.  Also send broadcast
to support TvSettings launching into adoption flow.

Bug: 19993667
Change-Id: Ic8a4034033c3cb3262023dba4a642efc6795af10
2015-04-23 20:32:17 -07:00
Tor Norbye
52881c8631 Add permission annotations to the Browser
Change-Id: Ib75a846faa4f73468d4c7bc04092ec0e80414d67
2015-04-23 18:49:23 -07:00
Jose Lima
786144599e Merge "Add pre-order as a pricing type for ContentInfoExtender" 2015-04-24 01:23:34 +00:00
Jose Lima
4112056201 Add pre-order as a pricing type for ContentInfoExtender
Change-Id: Ibf9e4f57b47e92789d3e0730c58b0bce14663fec
2015-04-23 16:25:10 -07:00
Ben Kwa
ff0cf1a95e Merge "Move extension checking code into FileUtils." 2015-04-23 23:19:49 +00:00
Ben Kwa
62539a220c Move extension checking code into FileUtils.
Move code for checking file extensions and MIME types from
ExternalStorageProvider into android.os.FileUtils, so it can be used by
other clients (e.g. DownloadsProvider).

BUG=20157955

Change-Id: Ib16a16af723c21fb8d2912c8917dfd68653ea6fa
2015-04-23 16:14:20 -07:00
Prerepa Viswanadham
571bb54c73 Reduce log spam in BluetoothAdapter for getState.
Change-Id: I38995fc55f12b000d58a769ed67aff623865169b
2015-04-23 22:31:29 +00:00
Adam Powell
a40c2c46b2 Merge "Fixes for ChooserTargetActivity" 2015-04-23 22:15:27 +00:00
Adam Powell
c6d5e3a406 Fixes for ChooserTargetActivity
* Always ensure intent filter is supplied to a ChooserTargetService.
* Add and clarify docs for ChooserTarget constructors.
* Fix a bug where ChooserTargets were being parceled incorrectly.

Change-Id: I32b70c424b0e6bb317e2eeb810566a30c21b9d53
2015-04-23 14:29:30 -07:00
Ed Heyl
a1ab2d37a0 Merge "Quick build fix: Revert "Add pre-order as a pricing type for ContentInfoExtender"" 2015-04-23 20:51:16 +00:00
Ed Heyl
cc5daf1be5 Quick build fix: Revert "Add pre-order as a pricing type for ContentInfoExtender"
This reverts commit 7e0f2ac425.

Change-Id: I52285a668ccfce547a398e1d6b40594dc99745f0
2015-04-23 20:50:44 +00:00
Jose Lima
b3614b7285 Merge "Add pre-order as a pricing type for ContentInfoExtender" 2015-04-23 19:54:59 +00:00
Abodunrinwa Toki
56195db6c4 TextView: Invalidate ActionMode content rect on scroll.
Bug: 20470464
Change-Id: I1a9178903db00d1cef5a835d055939b2ce138290
2015-04-23 19:10:54 +00:00
Tor Norbye
63fc151475 Merge "Add @RequiresPermission" 2015-04-23 18:36:33 +00:00
Abodunrinwa Toki
ab79dee28a Merge "Fix FloatingToolbar.show()" 2015-04-23 18:27:23 +00:00
Craig Mautner
00984f1629 Merge "Disallow data clearing of DeviceOwner." 2015-04-23 18:15:03 +00:00
Svet Ganov
112de0d41b Merge "Return an empty cursor when a content provider app op is disabled" 2015-04-23 18:12:52 +00:00
Craig Mautner
015c5e57b5 Disallow data clearing of DeviceOwner.
There are OEM provided apps that are able to clear the data of the
device owner. That creates a security hole that this fixes.

Fixes bug 20107015.

Change-Id: I4ef313b394bd8059d19d20aa6533396305d1357d
2015-04-23 11:05:02 -07:00
Joe Fernandez
78cb6f5458 am 1009c8de: am 92ae292e: Merge "docs: Add text to JavaDocs regarding browser file access vulnerability" into lmp-mr1-ub-docs
* commit '1009c8de23920c4a368edf7f1e2ecde63e40ec82':
  docs: Add text to JavaDocs regarding browser file access vulnerability
2015-04-23 17:57:02 +00:00
Joe Fernandez
1009c8de23 am 92ae292e: Merge "docs: Add text to JavaDocs regarding browser file access vulnerability" into lmp-mr1-ub-docs
* commit '92ae292e864287abcb1a78c117263f64b303b885':
  docs: Add text to JavaDocs regarding browser file access vulnerability
2015-04-23 17:45:19 +00:00
Abodunrinwa Toki
0ce3e08a84 Fix FloatingToolbar.show()
*Finer cancel animation methods so we call only the necessary ones.

*Don't set the FloatingToolbarPopup content view's alpha to 0
 before showing it's popup window.

*FloatingToolbarPopup.dismiss() should run when toolbar is hidden.

Bug: 20456876
Change-Id: I2e7ff5f2ec56af2def0976fa8e770c651daaa3a3
2015-04-23 17:33:58 +00:00
Svet Ganov
7271f3e4cb Return an empty cursor when a content provider app op is disabled
bug:17446599

Change-Id: Ic1790c9afbee5eec1dc28e1d53ce82288d4b4f86
2015-04-23 10:26:59 -07:00
Yorke Lee
6446d97942 Merge "Add hidden class in framework for managing the default dialer settings" 2015-04-23 17:23:41 +00:00
Yorke Lee
014de02dd2 Add hidden class in framework for managing the default dialer settings
Bug: 20303635
Change-Id: I7e7318086ade9531fb85f08b8e3f1f001ee0a8d9
2015-04-23 10:19:52 -07:00
Dianne Hackborn
871af48390 Merge "Add "assist block" API." 2015-04-23 16:26:27 +00:00
Jason Monk
052324c137 Merge "Add constants for usage access settings" 2015-04-23 14:42:17 +00:00
Jason Monk
6f909783e9 Add constants for usage access settings
Bug: 20290386
Change-Id: I216ad25b94de739449941a8b4e965329fe324f66
2015-04-23 10:07:56 -04:00
Abodunrinwa Toki
19d0f53964 Merge "Fix floating toolbar touchable region bug." 2015-04-23 12:50:56 +00:00
Lorenzo Colitti
51f88a15e1 Merge "@removed requestRouteToHost and {start,stop}UsingNetworkFeature" 2015-04-23 10:21:28 +00:00
Andrei Stingaceanu
e72e94767c Merge "Introduce "Share" option to the floating text selection toolbar." 2015-04-23 09:15:07 +00:00
Rubin Xu
1964ea500b Merge "Enable system service to notify device owners about pending update" 2015-04-23 09:05:07 +00:00
Lorenzo Colitti
e285b434f4 @removed requestRouteToHost and {start,stop}UsingNetworkFeature
Bug: 20482461
Change-Id: Ic59fc1271e664d85102dc7945c0c2ea82c0d6f6b
2015-04-23 17:44:05 +09:00
Keisuke Kuroyanagi
3239a62d31 Merge "Fix: Wrong condition to detect selection shrink." 2015-04-23 06:07:07 +00:00
Keisuke Kuroyanagi
08f7fd4d79 Fix: Wrong condition to detect selection shrink.
In the old logic, vertical selection shrink is detected
when the offset decreases and line number of the end handle
position increases. This never happens.

Bug: 20482453
Change-Id: I9e51742fcab4abe939f72130c51be773818aec62
2015-04-23 14:33:07 +09:00
Doris Liu
7b380329ec Merge "Infer value type for keyframes when it is undefined" 2015-04-23 01:13:39 +00:00
Dianne Hackborn
799d8d0a0f Add "assist block" API.
To prevent assist structure traversal down the view hierarchy.

Change-Id: I50ce5f8de6f2eca3cb862de8eacd6422c40a2f7c
2015-04-22 17:36:48 -07:00
Joe Fernandez
22b5ba8c01 docs: Add text to JavaDocs regarding browser file access vulnerability
b/17420682

Change-Id: Ic03b51778280570be65ae933fd906b140acdf023
2015-04-22 17:29:12 -07:00
Mike Lockwood
60a6df9b95 Merge "Add Context.MIDI_Service to the public API" 2015-04-23 00:12:57 +00:00
Todd Kennedy
acf4698ce6 Merge "Add hardware feature describing a car" 2015-04-22 22:42:14 +00:00
Mike Lockwood
ec32ac95dc Add Context.MIDI_Service to the public API
I forgot this when the rest of MidiManager was made public.

Change-Id: Ic5f8e2674d5b8e13bd88feebf3cf219f7af7fbcc
2015-04-22 15:33:34 -07:00
Doris Liu
a01fbf35de Infer value type for keyframes when it is undefined
Bug: 20140483

Change-Id: Idf6caea2a8eae803e33dd34b9c8f563ad12e1848
2015-04-22 14:50:17 -07:00
Tor Norbye
891ad60a6f Merge "Add threading annotations" 2015-04-22 21:32:39 +00:00
Todd Kennedy
7f95a00ec0 Add hardware feature describing a car
We need to define a hardware feature for when Android is running
embedded on a vehicle's headunit. This is not applicable when
running Android on a phone and projecting onto a headunit.

Bug: 20016089
Change-Id: I70e94564f7493afe70a49bf582a627c5ea9f0a60
2015-04-22 14:28:25 -07:00
Rubin Xu
dc105cc91c Enable system service to notify device owners about pending update
Create a DevicePolicyManager API which can be used by OTA subsystem
to tell device owners about pending updates. Device owners will get
a callback from its DeviceAdminReceiver when the update service sends
out such notifications.

Bug: 20213644
Change-Id: Ifcc755655e4f441980cf77d76175a046112ca9ae
2015-04-22 22:11:04 +01:00