Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
189,406 Commits 3 Branches 0 Tags
b3614b7285fd0aa2ea385df42eef2d69d37e8c27
Commit Graph

47144 Commits

Author SHA1 Message Date
Jose Lima
b3614b7285 Merge "Add pre-order as a pricing type for ContentInfoExtender" 2015-04-23 19:54:59 +00:00
Tor Norbye
63fc151475 Merge "Add @RequiresPermission" 2015-04-23 18:36:33 +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
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
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
Jose Lima
7e0f2ac425 Add pre-order as a pricing type for ContentInfoExtender 
Change-Id: I137d038c82342869dd104b178f1b11ba02fed07c
 2015-04-22 13:08:45 -07:00
Mady Mellor
73d74680b7 Merge "Enable stylus scale by default for apps targeting MNC+" 2015-04-22 19:21:36 +00:00
Mady Mellor
7c36a685fe Enable stylus scale by default for apps targeting MNC+ 
Bug: 20467919
Change-Id: Icadd45c8031e362d8101419c298133d59165939b
 2015-04-22 11:52:31 -07:00
Adam Skory
26d68e50fa Merge "nullcheck Activity.getIntent() for AssistContent" 2015-04-22 17:59:34 +00:00
Dianne Hackborn
f45e16f2da Merge "Work on issue #20401752: device idle and alarms." 2015-04-22 17:49:39 +00:00
Adam Skory
4aaed145f8 nullcheck Activity.getIntent() for AssistContent 
Nothing stopping an Activity from giving us a
null Intent, and the Intent copy constructor
requires a non-null arg.

Bug: 20419159
Change-Id: I8b12a127431869394697e947e2298d4dbbe08604
 2015-04-22 11:29:31 -06:00
Andres Morales
6bac04abc9 Merge "Expose getAuthenticatorId API" 2015-04-22 16:56:28 +00:00
Mady Mellor
724866172a Merge "Remove mouse association in scaling, only do it for stylus, update doc." 2015-04-22 16:56:13 +00:00
Andres Morales
4d41a203a0 Expose getAuthenticatorId API 
Change-Id: I112c45d596c66e3f6ebd94fecffcb6bb7c3a335a
 2015-04-22 16:55:10 +00:00
Craig Mautner
81786701b6 Merge "Add API for putting up locktask pinning toast." 2015-04-22 14:11:08 +00:00
Neil Fuller
52dbaa08cd Merge "Add checks for types in Parcel / avoid class initialization" 2015-04-22 13:30:02 +00:00
Martijn Coenen
3624b170e4 Merge "Add NFC APIs for dynamic resources." 2015-04-22 13:02:06 +00:00
Martijn Coenen
8abf680e00 Add NFC APIs for dynamic resources. 
For new Tap & Pay settings UX.

Change-Id: I55ff4e4d4a4b6d26c3c88d96431c4f14d0963323
 2015-04-22 11:56:36 +02:00
Andrei Stingaceanu
c649dae8e0 Merge "Cleanup unused icons on the floating toolbar." 2015-04-22 09:25:31 +00:00
Keisuke Kuroyanagi
05fd8d50b2 Stop showing "Replace" when selection isn't inside spans. 
Currently, "Replace" is shown when any spans intersects
the selection. It causes confusing behavior when multiple
words are selected. "Replace" is in the ActionBar, but it's
unclear which word will be replaced. It can happen when
text is selected using long tap + drag, unig keyboard, or
using a mouse.

Bug: 19396964
Change-Id: I512f5f566d4060cd0aa7b28594054bf4f6bf7458
 2015-04-22 15:33:27 +09:00
Lorenzo Colitti
ac6724b6e5 Merge "Don't require ACCESS_NETWORK_STATE in setProcessDefaultNetwork" 2015-04-22 04:04:56 +00:00
Lorenzo Colitti
ec4c555571 Don't require ACCESS_NETWORK_STATE in setProcessDefaultNetwork 
The documentation for setProcessDefaultNetwork does not
mention that it requires ACCESS_NETWORK_STATE, but a process
without ACCESS_NETWORK_STATE that calls it will crash because
we can't fetch the proxy properties.

Because ACCESS_NETWORK_STATE is not required to obtain a Network
object (Network objects can come from broadcasts too), it may not
be reasonable to require the permission. We did not do so in L.

For now, ignore the failure and don't crash the app. I've filed
http://b/20470604 to track a longer term fix.

Bug: 20081183
Bug: 20423580
Bug: 20470604
Change-Id: I158016130b4afb1d300357fe703804d2e7bc609b
 2015-04-22 12:27:33 +09:00
Tingting Wang
e0aac80b9b Merge "Add MetadataSync table to ContactsContract." 2015-04-22 03:25:56 +00:00
fenglu
b32243498f Merge "update API name to requestBandwidthUpdate()" 2015-04-22 01:32:19 +00:00
Justin Koh
ba75135a80 am 2aa3905c: Merge "DO NOT MERGE: The ValueAnimator\'s state need to be totally reset during clone." into lmp-mr1-modular-dev 
* commit '2aa3905cb0cc595783ab43b0bc7a4b3818003958':
  DO NOT MERGE: The ValueAnimator's state need to be totally reset during clone.
 2015-04-22 00:43:16 +00:00
ztenghui
059451e185 am 23606598: DO NOT MERGE: Reset the Node status when clone. 
* commit '23606598244c2a297d994895eaf631b240d33242':
  DO NOT MERGE: Reset the Node status when clone.
 2015-04-22 00:43:08 +00:00