drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
189,431 Commits 1 Branch 0 Tags
Commit Graph

189431 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Paul McLean
ec4097b0ca Merge "Explicit routing in AudioRecord" 2015-04-23 22:25:19 +00:00
Adrian Roos
3acf4f5c91 Merge "Migrate lockscreen.disabled on upgrade" 2015-04-23 22:15:40 +00:00
Adam Powell
a40c2c46b2 Merge "Fixes for ChooserTargetActivity" 2015-04-23 22:15:27 +00:00
Adrian Roos
4383058bf4 Migrate lockscreen.disabled on upgrade 
Bug: 19962043
Change-Id: Iecec4ea869aeb9d814f7447b4805caa571f3fd01
 2015-04-23 22:14:12 +00:00
Paul McLean
2d6de4c38c Explicit routing in AudioRecord 
Change-Id: Ib3af1041d9f7bbccefd6b86cd3c35baf742be861
 2015-04-23 16:11:34 -06:00
Quddus Chong
ed191db3a3 am 5dafb34b: resolved conflicts for merge of e470fd85 to lmp-mr1-ub-dev 
* commit '5dafb34bca889abb8776a320b1ed9544cff9f9b3':
  docs: Added 3rd-party Javadocs for GMS Parmesan release.
 2015-04-23 22:02:12 +00:00
Quddus Chong
5dafb34bca resolved conflicts for merge of e470fd85 to lmp-mr1-ub-dev 
Change-Id: I9ecfa4b7b225f2543bdbdad0f046e9474f1cb47f
 2015-04-23 14:30:26 -07: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 7e0f2ac42574b524d7b06afaf9221bde5d0af228.

Change-Id: I52285a668ccfce547a398e1d6b40594dc99745f0
 2015-04-23 20:50:44 +00:00
Andrew Solovay
9b045e5fbe am 62eaad72: am f9787d87: Merge "cherrypick from lmp-docs Docs: Correcting how to escape quotes. Original Change-Id: I417546a473f0ebe76a6e4102b87883a85365ac26" into lmp-mr1-ub-docs 
* commit '62eaad7200e172404db587ecec9940670946e92a':
  cherrypick from lmp-docs Docs: Correcting how to escape quotes. Original Change-Id: I417546a473f0ebe76a6e4102b87883a85365ac26
 2015-04-23 20:47:39 +00:00
Andrew Solovay
62eaad7200 am f9787d87: Merge "cherrypick from lmp-docs Docs: Correcting how to escape quotes. Original Change-Id: I417546a473f0ebe76a6e4102b87883a85365ac26" into lmp-mr1-ub-docs 
* commit 'f9787d87e03987561f13888b912f96b2e473b674':
  cherrypick from lmp-docs Docs: Correcting how to escape quotes. Original Change-Id: I417546a473f0ebe76a6e4102b87883a85365ac26
 2015-04-23 20:36:42 +00:00
Andrew Solovay
f9787d87e0 Merge "cherrypick from lmp-docs Docs: Correcting how to escape quotes. Original Change-Id: I417546a473f0ebe76a6e4102b87883a85365ac26" into lmp-mr1-ub-docs 2015-04-23 20:25:45 +00:00
Quddus Chong
291e49078f am 9af35e73: am 79918589: docs: Fixed url for Wear sample on \'What\'s New for GMS v7.3\'. 
* commit '9af35e73adb813b7a73a2802ac14c7810c90bc6a':
  docs: Fixed url for Wear sample on 'What's New for GMS v7.3'.
 2015-04-23 20:25:17 +00:00
Quddus Chong
9af35e73ad am 79918589: docs: Fixed url for Wear sample on \'What\'s New for GMS v7.3\'. 
* commit '79918589e18c73d63c08b9688bfb2cf6af0aa0df':
  docs: Fixed url for Wear sample on 'What's New for GMS v7.3'.
 2015-04-23 20:11:47 +00:00
Andrew Solovay
a967cade1d cherrypick from lmp-docs Docs: Correcting how to escape quotes. 
Original Change-Id: I417546a473f0ebe76a6e4102b87883a85365ac26

The behavior for single and double-quotes is different--I expanded
this section to note how they differ.

bug: 19959941
Change-Id: I9be9c066c416e9403a3ac164af0b1ce35f7ab1dd
 2015-04-23 13:07:29 -07:00
Quddus Chong
79918589e1 docs: Fixed url for Wear sample on 'What's New for GMS v7.3'. 
Change-Id: I42a9e28e40fe54aff1f1882265e4e472fa9cf9a0
 2015-04-23 12:56:05 -07:00
Craig Mautner
00c7949426 Merge "Fix NPE when load() returns nulls." 2015-04-23 19:55:03 +00:00
Jose Lima
b3614b7285 Merge "Add pre-order as a pricing type for ContentInfoExtender" 2015-04-23 19:54:59 +00:00
Craig Mautner
1513ff171a Fix NPE when load() returns nulls. 
Fixes bug 20528625.

Change-Id: I825c95fd212a1928a34e9ed0e20d2f7563939cbb
 2015-04-23 12:52:58 -07:00
Robert Greenwalt
3f3a2a87e6 Merge "Make sure to return network type after conversion" 2015-04-23 19:12:30 +00:00
Sooraj Sasindran
4f18c60f48 Make sure to return network type after conversion 
After converting raf to type, make sure to return
network type

Change-Id: I7fd338717be98a055cbaed66d1b15417da27a3d8
 2015-04-23 12:04:08 -07:00
Andrew Solovay
fc60f7012e am 591ba605: am 26a8090a: cherrypick from lmp-docs docs: Listening for restrictions-changed Original Change-Id: I19c7150a9f36de226d00ad6d8db0e9210d5d135d 
* commit '591ba605aa91fdec05ac73399ee5893da63833e8':
  cherrypick from lmp-docs docs: Listening for restrictions-changed Original Change-Id: I19c7150a9f36de226d00ad6d8db0e9210d5d135d
 2015-04-23 19:01:32 +00:00
Svet Ganov
9bafd3b5e0 Merge "Revert some unnecessary changes in handling XML read" 2015-04-23 19:00:35 +00:00
Svet Ganov
e723e54650 Revert some unnecessary changes in handling XML read 
Change-Id: I3bbbc3159930d80e2e1f28fa9c0035ae5029d4b8
 2015-04-23 11:58:26 -07:00
Jorim Jaggi
a47f4d7c4d Merge "Position panel dynamically when expanding" 2015-04-23 18:53:18 +00:00
Andrew Solovay
591ba605aa am 26a8090a: cherrypick from lmp-docs docs: Listening for restrictions-changed Original Change-Id: I19c7150a9f36de226d00ad6d8db0e9210d5d135d 
* commit '26a8090a09bce05398cc52581ea4a5cf05d28d59':
  cherrypick from lmp-docs docs: Listening for restrictions-changed Original Change-Id: I19c7150a9f36de226d00ad6d8db0e9210d5d135d
 2015-04-23 18:50:04 +00:00
Jorim Jaggi
6d4a27fb7f Position panel dynamically when expanding 
Bug: 17125022
Change-Id: Ia39aa40c27958a6ba4eb183522d22bfad958fe5e
 2015-04-23 11:48:22 -07:00
Tor Norbye
63fc151475 Merge "Add @RequiresPermission" 2015-04-23 18:36:33 +00:00
Andrew Solovay
26a8090a09 cherrypick from lmp-docs docs: Listening for restrictions-changed 
Original Change-Id: I19c7150a9f36de226d00ad6d8db0e9210d5d135d

Per bug 19848206, it turns out that APPLICATION_RESTRICTIONS_CHANGED
is only sent to dynamically-declared listeners, *not* to listeners
declared in the manifest. Updated doc to note this. (The code snippet
already showed how to dynamically declare a listener.)

See first comment for doc stage location.

bug: 19848206
Change-Id: I6dc5f39dc6eed71cf2e303564ea906be3832d8a4
 2015-04-23 11:35:39 -07:00
Robert Greenwalt
b36d2a6111 Merge "Radio Access Family related fixes" 2015-04-23 18:34:35 +00:00
Abhishek Adappa
c180f9adf7 Radio Access Family related fixes 
1. Include EHRPD in the EVDO group
2. Fix mapping of CDMA network type to include EVDO
3. Add utility to get the network type from the Raf

Change-Id: I35023083be4c681809c003c7ed6a31c698ea4647
 2015-04-23 11:33:30 -07:00
Andrew Flynn
1326769666 Merge "Demo Mode instructions for Carrier Network Change icon" 2015-04-23 18:32:46 +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
Dianne Hackborn
be3d85fb96 Merge "Hopefully fix issue #20297662: Statusbar clock not updating" 2015-04-23 17:37:29 +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
Joe Fernandez
92ae292e86 Merge "docs: Add text to JavaDocs regarding browser file access vulnerability" into lmp-mr1-ub-docs 2015-04-23 17:33:18 +00:00
Dianne Hackborn
35d5403775 Hopefully fix issue #20297662: Statusbar clock not updating 
Make sure that whenever we no longer have a pending-idle-until
alarm, we get all of the pending alarms re-added.

Change-Id: I7e80bc02afff22827d876ef5d4a381ebb62ec8e3
 2015-04-23 10:30:43 -07: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
Tomasz Mikolajewski
366459ee59 Merge "Update strings for the copy error dialog to match the latest specs." 2015-04-23 17:13:33 +00:00
Robert Greenwalt
cfa26c2a38 Merge "Don't show two identical carrier names." 2015-04-23 17:12:55 +00:00
Tomasz Mikolajewski
eafb267bd9 Update strings for the copy error dialog to match the latest specs. 
Change-Id: I9adeff3e7e9435237b4b3337e4c687eec39b0335
 2015-04-23 19:10:14 +02:00
Tomasz Mikolajewski
43fe1b3431 Merge "Implement retrying copying in case of an error in DocumentsUI." 2015-04-23 17:06:27 +00:00