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

123877 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hui Lu
c80fa71e88 Add interface name for proxy network type. 
This will make test
android.net.cts.ConnectivityManagerTest#testRequestRouteToHost pass.
Change-Id: I5a14b6d705e87018e1e2c031aaacee533536a50b

Bug: 15320910
 2014-06-05 17:06:13 +00:00
Robin Lee
6959133d84 Add Environment call: get config dir for some user 
This returns a read-only directory accessible to any app running as the
same user, containing various configuration files written by the system.

Change-Id: I635de184fc285b8fef166b782bbc1ac79f8f0687
 2014-06-05 14:34:23 +00:00
Justin Koh
2dbd36fc7f Add check to allow notification listener packages to post >50 notifications 
Bug: 13433398
Change-Id: I77abf19982add240e1bbe8196fbe148d32884f68
 2014-06-04 21:14:26 -07:00
Craig Mautner
21483b9f0b am e34fcf8f: Merge "Add callback when ActivityView activities complete" into klp-modular-dev 
* commit 'e34fcf8ff9a023641505a8decdeb1b77232d8a16':
  Add callback when ActivityView activities complete
 2014-06-05 03:31:06 +00:00
Craig Mautner
e34fcf8ff9 Merge "Add callback when ActivityView activities complete" into klp-modular-dev 2014-06-05 03:28:21 +00:00
Craig Mautner
d94b47f3b6 Add callback when ActivityView activities complete 
Users of ActivityViews can now be informed when there are no more
active activities in ActivityView by registering a callback.

Fixes bug 15330616.

Change-Id: I39d55bdb0db8b0a12ee751cdcb039b7fbb899c85
 2014-06-04 17:25:49 -07:00
Dave Holmes
b3b6f1481e am b766edce: am 4e99af34: am aabfcb78: Merge "Adding links to the Gradle docs. Both of these files ask you to change the contents of your gradle file, but neither links to reference information on gradle. Because this is still pretty new information, I\'d like to incl 
* commit 'b766edcea3dfdc6513218649b9ad2030bc195c23':
  Adding links to the Gradle docs. Both of these files ask you to change the contents of your gradle file, but neither links to reference information on gradle. Because this is still pretty new information, I'd like to include a link to the Building with Gradle documentation.
 2014-06-04 23:45:42 +00:00
Dave Holmes
b766edcea3 am 4e99af34: am aabfcb78: Merge "Adding links to the Gradle docs. Both of these files ask you to change the contents of your gradle file, but neither links to reference information on gradle. Because this is still pretty new information, I\'d like to include a link to 
* commit '4e99af342b340bebcd635137966d21c59c294532':
  Adding links to the Gradle docs. Both of these files ask you to change the contents of your gradle file, but neither links to reference information on gradle. Because this is still pretty new information, I'd like to include a link to the Building with Gradle documentation.
 2014-06-04 23:41:49 +00:00
Dave Holmes
4e99af342b am aabfcb78: Merge "Adding links to the Gradle docs. Both of these files ask you to change the contents of your gradle file, but neither links to reference information on gradle. Because this is still pretty new information, I\'d like to include a link to the Building 
* commit 'aabfcb78cf29e3d670831c770b9d757eb79487e4':
  Adding links to the Gradle docs. Both of these files ask you to change the contents of your gradle file, but neither links to reference information on gradle. Because this is still pretty new information, I'd like to include a link to the Building with Gradle documentation.
 2014-06-04 23:38:34 +00:00
Dave Holmes
aabfcb78cf Merge "Adding links to the Gradle docs. Both of these files ask you to change the contents of your gradle file, but neither links to reference information on gradle. Because this is still pretty new information, I'd like to include a link to the Building with Gradle documentation." into klp-docs 2014-06-04 23:35:50 +00:00
Adam Lesinski
510ef1b537 Allow for a NoOp implementation of DrmManagerClientImpl 
Change-Id: I150b95790d5e6d3c0160637149f18f2194318de8
 2014-06-04 15:05:56 -07:00
Elliott Hughes
ef3aeecacd am 38a5a257: am 759a8978: Merge "Minor javadoc improvements for PackageManager." 
* commit '38a5a257a9aaf85606eb7117d943a877dc7d3c93':
  Minor javadoc improvements for PackageManager.
 2014-06-04 22:02:34 +00:00
Elliott Hughes
fc01a6687b am c1973c28: am c0f4ac1b: Merge "Delete duplicate SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION flag" 
* commit 'c1973c2888bde77f2dd5dbdba6225afb8829ed46':
  Delete duplicate SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION flag
 2014-06-04 21:48:08 +00:00
Elliott Hughes
38a5a257a9 am 759a8978: Merge "Minor javadoc improvements for PackageManager." 
* commit '759a89782d38ddf6ab7f4a2c22c8911ea206b275':
  Minor javadoc improvements for PackageManager.
 2014-06-04 21:46:12 +00:00
Elliott Hughes
c1973c2888 am c0f4ac1b: Merge "Delete duplicate SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION flag" 
* commit 'c0f4ac1bb8668702fa0f053d0ca219bab7dde67c':
  Delete duplicate SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION flag
 2014-06-04 21:29:08 +00:00
Elliott Hughes
759a89782d Merge "Minor javadoc improvements for PackageManager." 2014-06-04 21:26:49 +00:00
Elliott Hughes
c0f4ac1bb8 Merge "Delete duplicate SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION flag" 2014-06-04 21:13:57 +00:00
Robin Lee
c774caff86 am 4891a9f9: am e46e6004: Merge "Assign AID_EVERYONE gid to newly-created processes" 
* commit '4891a9f9cfee569c0d362f1781f44493f5e320c0':
  Assign AID_EVERYONE gid to newly-created processes
 2014-06-04 21:09:52 +00:00
Robin Lee
4891a9f9cf am e46e6004: Merge "Assign AID_EVERYONE gid to newly-created processes" 
* commit 'e46e60041215249a285384cd2282de9f4d956a04':
  Assign AID_EVERYONE gid to newly-created processes
 2014-06-04 20:55:02 +00:00
Deepanshu Gupta
e478c5624d am 905e113f: am 03df93bc: am 5cde33a6: am dcfba78f: am ed5ab0f0: am 022d8a9f: am bad112f2: am c8235b8e: am ffcad247: am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev 
* commit '905e113f97560dbcf71cab517ab4c1ee4faaa4d3':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:52:36 +00:00
Robin Lee
e46e600412 Merge "Assign AID_EVERYONE gid to newly-created processes" 2014-06-04 20:51:55 +00:00
Deepanshu Gupta
905e113f97 am 03df93bc: am 5cde33a6: am dcfba78f: am ed5ab0f0: am 022d8a9f: am bad112f2: am c8235b8e: am ffcad247: am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev 
* commit '03df93bcb854eedc600ef0120fd238ec974c44a1':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:48:19 +00:00
Deepanshu Gupta
03df93bcb8 am 5cde33a6: am dcfba78f: am ed5ab0f0: am 022d8a9f: am bad112f2: am c8235b8e: am ffcad247: am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev 
* commit '5cde33a6ffd6a3be87f6622e67c3d83fb61519cb':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:45:02 +00:00
Deepanshu Gupta
5cde33a6ff am dcfba78f: am ed5ab0f0: am 022d8a9f: am bad112f2: am c8235b8e: am ffcad247: am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev 
* commit 'dcfba78fbb4dad6792113383b2d32eff7f2c1f88':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:41:47 +00:00
Deepanshu Gupta
dcfba78fbb am ed5ab0f0: am 022d8a9f: am bad112f2: am c8235b8e: am ffcad247: am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev 
* commit 'ed5ab0f01eac6686165f67fe0e9dec3bb48bbb4b':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:38:25 +00:00
Deepanshu Gupta
ed5ab0f01e am 022d8a9f: am bad112f2: am c8235b8e: am ffcad247: am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev 
* commit '022d8a9f4400dc7ec2926b133fc7151d8a5c24a3':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:34:14 +00:00
Deepanshu Gupta
9f213b1e2b am 46c3beef: am 3ce1ca68: am 0ed9d498: am 328b1f92: (-s ours) am 5d3e3851: am af3f96e4: am e87c63e0: (-s ours) am d2dff39b: am b1ca2a0c: am f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev 
* commit '46c3beefad751fde9ba44d092a947df49d94219a':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:32:50 +00:00
Deepanshu Gupta
3c15d8d688 am 14104896: am e4aa3138: am a9e82914: Merge branch \'klp-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-dev 
* commit '14104896770dd26195cd9ccfac8c1604cb95dbc6':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:32:46 +00:00
Deepanshu Gupta
f2862a849c am 4da5807c: am 88c9ca28: am d49f9b25: am 2983ee55: (-s ours) am 12b657d7: am dade24b4: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr2-dev 
* commit '4da5807ce0e6a190c5e1de37297d454368906e76':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:32:43 +00:00
Deepanshu Gupta
022d8a9f44 am bad112f2: am c8235b8e: am ffcad247: am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev 
* commit 'bad112f23f09f8839b4b7294439b0fe725cc2034':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:30:05 +00:00
Deepanshu Gupta
46c3beefad am 3ce1ca68: am 0ed9d498: am 328b1f92: (-s ours) am 5d3e3851: am af3f96e4: am e87c63e0: (-s ours) am d2dff39b: am b1ca2a0c: am f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev 
* commit '3ce1ca68309231e693964824917a66f36e575fd7':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:29:11 +00:00
Deepanshu Gupta
1410489677 am e4aa3138: am a9e82914: Merge branch \'klp-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-dev 
* commit 'e4aa31382139ee2e319110fbfff402e0c6315952':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:29:06 +00:00
Deepanshu Gupta
4da5807ce0 am 88c9ca28: am d49f9b25: am 2983ee55: (-s ours) am 12b657d7: am dade24b4: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr2-dev 
* commit '88c9ca28effb9745d13647bd25d34b6ef53e7cb9':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:29:03 +00:00
Deepanshu Gupta
bad112f23f am c8235b8e: am ffcad247: am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev 
* commit 'c8235b8e7446c849df10ff2f897d2a3743b4934d':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:27:49 +00:00
Deepanshu Gupta
3ce1ca6830 am 0ed9d498: am 328b1f92: (-s ours) am 5d3e3851: am af3f96e4: am e87c63e0: (-s ours) am d2dff39b: am b1ca2a0c: am f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev 
* commit '0ed9d498b740273fdbcdf51f55648c23df29accc':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:26:07 +00:00
Deepanshu Gupta
e4aa313821 am a9e82914: Merge branch \'klp-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-dev 
* commit 'a9e8291409a916186cd96b8bc557a6ac83d6b1ae':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:25:57 +00:00
Deepanshu Gupta
88c9ca28ef am d49f9b25: am 2983ee55: (-s ours) am 12b657d7: am dade24b4: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr2-dev 
* commit 'd49f9b25310ac63310b0e5c7aeedca1d9e6ccda0':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:25:54 +00:00
Deepanshu Gupta
c8235b8e74 am ffcad247: am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev 
* commit 'ffcad247d0401fb529441ecc65437226c2845461':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:21:00 +00:00
Deepanshu Gupta
0ed9d498b7 am 328b1f92: (-s ours) am 5d3e3851: am af3f96e4: am e87c63e0: (-s ours) am d2dff39b: am b1ca2a0c: am f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev 
* commit '328b1f92787bb4d793398ba6d8aa9b2025c62ca1':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:20:52 +00:00
Deepanshu Gupta
a9e8291409 Merge branch 'klp-dev' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-dev 2014-06-04 20:20:51 +00:00
Deepanshu Gupta
d49f9b2531 am 2983ee55: (-s ours) am 12b657d7: am dade24b4: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr2-dev 
* commit '2983ee55a6d578b15b4862c9c8523bf00f7d83d5':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:20:27 +00:00
Deepanshu Gupta
ab6c61b2dd Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into klp-dev 2014-06-04 20:20:26 +00:00
Deepanshu Gupta
ffcad247d0 am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev 
* commit '904b89c58465b0d0822478be514572ec752df3e8':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:17:40 +00:00
Deepanshu Gupta
328b1f9278 am 5d3e3851: am af3f96e4: am e87c63e0: (-s ours) am d2dff39b: am b1ca2a0c: am f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev 
* commit '5d3e3851bbe1ab0b30e593b371e98f02f5ed2f5d':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:15:37 +00:00
Deepanshu Gupta
2983ee55a6 am 12b657d7: am dade24b4: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr2-dev 
* commit '12b657d74961ba5a6175162b7548cce4e77c9bbc':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:15:33 +00:00
Deepanshu Gupta
904b89c584 am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev 
* commit '295184bc71a32a4e9418d34b2adeb0cef4b39781':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:14:52 +00:00
Deepanshu Gupta
5d3e3851bb am af3f96e4: am e87c63e0: (-s ours) am d2dff39b: am b1ca2a0c: am f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev 
* commit 'af3f96e4349f63f862de004853ba8e10e5ee51ae':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:11:23 +00:00
Deepanshu Gupta
12b657d749 am dade24b4: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr2-dev 
* commit 'dade24b491c82ff0b96d025c908e7eaf1bab99ba':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:11:19 +00:00
Deepanshu Gupta
295184bc71 am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev 
* commit '8782a12005e90bbd49be579fb8ede3a42a007380':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:10:55 +00:00
Deepanshu Gupta
af3f96e434 am e87c63e0: (-s ours) am d2dff39b: am b1ca2a0c: am f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev 
* commit 'e87c63e0e41cf34ef4b1ea1b06bf6a94c1f229c6':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:08:29 +00:00