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

189665 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Santos Cordon
e3c507b79b Remove CallState and rename PRE_DIAL_WAIT 
Bug: 20532827
Bug: 20532435
Change-Id: I5f0308c5cf4e4a9cf9020b4fe7fa5f3f8dee6e67
 2015-04-23 14:44:19 -07:00
Paul McLean
d5bad53a0c (Re)routing Notification API in AudioTrack/AudioRecord. 
Change-Id: If6594df7e3ed4c4a67878f98c05e3153633cf263
 2015-04-23 15:38:25 -06: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
Tony Mantler
547e4caebe Move StorageMeasurement to SettingsLib 
Change-Id: I90ea3b32971f02def418385ebac1f03f06390ba7
 2015-04-23 14:16:44 -07:00
Jens Ole Lauridsen
8dea8744ac parcel: Add efficient methods for writing and reading a parcelable. 
The documentation used to recommend calling Parcelable.writeToParcel
instead of using the Parcel API for sending Parcelable types.
This leaves the developer to have to deal with null values and makes
it harder to create tools that generate correct efficient code.
I suggest that we add a these 2 methods:
   writeTypedObject and createTypedObject
as an alternative.

Change-Id: I85443417909dcb9590d3f0a72f0130a4da4ead38
 2015-04-23 14:12:04 -07:00
Andrew Solovay
090df87d7e am 4dde4c9e: am e45e41d7: am 44fa5e71: am 5b3152cf: Merge "Docs: Correcting section on how to escape quotes in strings." into lmp-docs 
* commit '4dde4c9e723826fae1275c6537d2d5a615b3a0ae':
  Docs: Correcting section on how to escape quotes in strings.
 2015-04-23 20:53:23 +00: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
4dde4c9e72 am e45e41d7: am 44fa5e71: am 5b3152cf: Merge "Docs: Correcting section on how to escape quotes in strings." into lmp-docs 
* commit 'e45e41d7fa6c88cf74be31a509003b8f9e7fa7b1':
  Docs: Correcting section on how to escape quotes in strings.
 2015-04-23 20:41:14 +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
e45e41d7fa am 44fa5e71: am 5b3152cf: Merge "Docs: Correcting section on how to escape quotes in strings." into lmp-docs 
* commit '44fa5e71ab709c83af387958598f551583d6dbb0':
  Docs: Correcting section on how to escape quotes in strings.
 2015-04-23 20:29: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
Andrew Solovay
44fa5e71ab am 5b3152cf: Merge "Docs: Correcting section on how to escape quotes in strings." into lmp-docs 
* commit '5b3152cffcd90441ca4cacdf5596e9bb3428af08':
  Docs: Correcting section on how to escape quotes in strings.
 2015-04-23 20:18:51 +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
Andrew Solovay
5b3152cffc Merge "Docs: Correcting section on how to escape quotes in strings." into lmp-docs 2015-04-23 20:06:34 +00: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
Abodunrinwa Toki
56195db6c4 TextView: Invalidate ActionMode content rect on scroll. 
Bug: 20470464
Change-Id: I1a9178903db00d1cef5a835d055939b2ce138290
 2015-04-23 19:10:54 +00:00
Andrew Solovay
8aff67ec36 am dad05551: am 24ccb900: am 7a866a88: am 09cf4d50: Merge "docs: Update to doc on listening for restrictions-changed intent" into lmp-docs 
* commit 'dad055518f3416d2c212230343cb8f9433e395a2':
  docs: Update to doc on listening for restrictions-changed intent
 2015-04-23 19:09:28 +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
Andrew Solovay
dad055518f am 24ccb900: am 7a866a88: am 09cf4d50: Merge "docs: Update to doc on listening for restrictions-changed intent" into lmp-docs 
* commit '24ccb900258443bff7d943ad0d4fe1ff1f6f0ba4':
  docs: Update to doc on listening for restrictions-changed intent
 2015-04-23 18:56:26 +00: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
Andrew Solovay
24ccb90025 am 7a866a88: am 09cf4d50: Merge "docs: Update to doc on listening for restrictions-changed intent" into lmp-docs 
* commit '7a866a88318f6a44f316dc18e0472f39a289fee6':
  docs: Update to doc on listening for restrictions-changed intent
 2015-04-23 18:44:24 +00: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
Andrew Solovay
7a866a8831 am 09cf4d50: Merge "docs: Update to doc on listening for restrictions-changed intent" into lmp-docs 
* commit '09cf4d500dd27342c913d2333f4f0fd2fa9dbfd0':
  docs: Update to doc on listening for restrictions-changed intent
 2015-04-23 18:31:59 +00:00
Abodunrinwa Toki
ab79dee28a Merge "Fix FloatingToolbar.show()" 2015-04-23 18:27:23 +00:00
Andrew Solovay
09cf4d500d Merge "docs: Update to doc on listening for restrictions-changed intent" into lmp-docs 2015-04-23 18:20:07 +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