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

105322 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
840f114395 am 7f3ff133: Merge "Fix wrong log information in DevicePolicyManagerService" 
* commit '7f3ff133c19ed50dd245e025a44e1de7bcc3d38a':
  Fix wrong log information in DevicePolicyManagerService
 2013-05-26 00:23:28 -07:00
Dianne Hackborn
7f3ff133c1 Merge "Fix wrong log information in DevicePolicyManagerService" 2013-05-26 07:22:21 +00:00
Dianne Hackborn
43861f9de9 am f46449ab: Merge "Avoid IllegalArgumentException in Preference.java compareTo()" 
* commit 'f46449abedcba2167fffa8ba8dc2f6d7a6d410b9':
  Avoid IllegalArgumentException in Preference.java compareTo()
 2013-05-26 00:02:46 -07:00
Dianne Hackborn
95b7996693 am 0a40bef9: Merge "Fix CalendarView to show the month title properly." 
* commit '0a40bef955c937189841b6f1695e8001311758fa':
  Fix CalendarView to show the month title properly.
 2013-05-26 00:02:41 -07:00
Dianne Hackborn
c73220050e am f9b41efe: Merge "Don\'t include flags in configuration change if their value hasn\'t changed." 
* commit 'f9b41efe17718a21df115d95c47a94d97a767076':
  Don't include flags in configuration change if their value hasn't changed.
 2013-05-26 00:02:37 -07:00
Dianne Hackborn
fc09b326da am fee6d0cb: Merge "Fix documentation of requestCode parameter." 
* commit 'fee6d0cb1e27b13f6ed91c1cdcb9d524bb967ea2':
  Fix documentation of requestCode parameter.
 2013-05-26 00:02:31 -07:00
Dianne Hackborn
087384b0af am f3251033: Merge "Framework/base: Added synchronization block to avoid race condition" 
* commit 'f325103356c559d6378da7fb7db3b2a49aba5d13':
  Framework/base: Added synchronization block to avoid race condition
 2013-05-26 00:02:24 -07:00
Dianne Hackborn
f46449abed Merge "Avoid IllegalArgumentException in Preference.java compareTo()" 2013-05-26 06:59:30 +00:00
Dianne Hackborn
0a40bef955 Merge "Fix CalendarView to show the month title properly." 2013-05-26 06:58:14 +00:00
Dianne Hackborn
f9b41efe17 Merge "Don't include flags in configuration change if their value hasn't changed." 2013-05-26 06:57:05 +00:00
Dianne Hackborn
fee6d0cb1e Merge "Fix documentation of requestCode parameter." 2013-05-26 06:56:03 +00:00
Dianne Hackborn
f325103356 Merge "Framework/base: Added synchronization block to avoid race condition" 2013-05-26 06:30:26 +00:00
The Android Open Source Project
d607b9c725 Reconcile with jb-mr2-release - do not merge 
Change-Id: I0f933138aaf9f70694ef9a326c3db63770a93917
 2013-05-24 15:28:19 -07:00
Scott Main
c851638092 am eebec7b1: Merge "fix javadoc links. turns out, without parameters, javadoc will link to the best matching method signature, even if it\'s from the superclass. So these were pointing to Object.nofify()" into jb-mr2-dev 
* commit 'eebec7b1fe68cef9c4feed1f56af2592b402a629':
  fix javadoc links. turns out, without parameters, javadoc will link to the best matching method signature, even if it's from the superclass. So these were pointing to Object.nofify()
 2013-05-24 14:42:58 -07:00
Scott Main
eebec7b1fe Merge "fix javadoc links. turns out, without parameters, javadoc will link to the best matching method signature, even if it's from the superclass. So these were pointing to Object.nofify()" into jb-mr2-dev 2013-05-24 21:40:45 +00:00
Alan Viverette
4026a797bc am 14ccf554: Merge "DO NOT MERGE. Fix number picker accessibility focus." into jb-mr2-dev 
* commit '14ccf554d0168d94c35c058b057d7d1aca228c6e':
  DO NOT MERGE. Fix number picker accessibility focus.
 2013-05-24 14:21:55 -07:00
Alan Viverette
14ccf554d0 Merge "DO NOT MERGE. Fix number picker accessibility focus." into jb-mr2-dev 2013-05-24 21:19:55 +00:00
Michael Wright
4759c35e42 am bf0d561c: Merge "Pipe through bounding box information (DO NOT MERGE)" into jb-mr2-dev 
* commit 'bf0d561c73abd97a1a3794e9aa62b21911279a12':
  Pipe through bounding box information (DO NOT MERGE)
 2013-05-24 13:53:47 -07:00
Deepanshu Gupta
fc691f9df0 am 417e512b: Merge "Add missing native methods." into jb-mr2-dev 
* commit '417e512ba1d099583c41bd7595f2124ca77c2aee':
  Add missing native methods.
 2013-05-24 13:53:44 -07:00
Michael Wright
bf0d561c73 Merge "Pipe through bounding box information (DO NOT MERGE)" into jb-mr2-dev 2013-05-24 20:52:40 +00:00
Deepanshu Gupta
417e512ba1 Merge "Add missing native methods." into jb-mr2-dev 2013-05-24 20:52:07 +00:00
Robert Greenwalt
8c1cb60b78 Use the old interface when resetting connections 
The new one is often null when disconnected, so using the new fails.
In other situations, it's the connections on the old network we want
to reset anyway, so the old code when it would work would also do
the wrong thing (unless new iface == old iface).

bug:9112928
Change-Id: I1fcae89cc3aa9d712e516e7c97cece0b89869bd9
 2013-05-24 12:25:04 -07:00
Robert Greenwalt
e70b8d7002 am 46fa10b1: am 1d8c5b5b: Merge "Update tethering profile for specific operators" 
* commit '46fa10b1a0a67e1937c9e696d1fd786162dcfb8e':
  Update tethering profile for specific operators
 2013-05-24 11:03:45 -07:00
Robert Greenwalt
46fa10b1a0 am 1d8c5b5b: Merge "Update tethering profile for specific operators" 
* commit '1d8c5b5b1df96004d6c6e0d056f0c3707461a01a':
  Update tethering profile for specific operators
 2013-05-24 11:01:28 -07:00
Robert Greenwalt
1d8c5b5b1d Merge "Update tethering profile for specific operators" 2013-05-24 17:59:03 +00:00
seonju.oh
8645031246 Update tethering profile for specific operators 
Update or add tethering profiles in config.xml.
And also add MOBILE_DUN to config_tether_upstream_types

FR-ORG,SFR
ES-VDF,ORG,Movistar
IT-VDF,TIM
GR-VDF
US-TMO
CA-Rogers,Fido
Isreal-ORG,PC HOT Mobile
HK-CSL,Hutchison
AU-Telstra

Change-Id: Ic3501263679785362bc50a5a4ea3751e7f0c7b21
Signed-off-by: Seonju Oh <seonju.oh@lge.com>
Signed-off-by: Sungmin Choi <sungmin.choi@lge.com>
 2013-05-24 10:33:11 -07:00
Alan Viverette
dbed27e5e4 DO NOT MERGE. Fix number picker accessibility focus. 
The node bounds populated by the child TextView were not consistent
with the bounds manually populated for its parent NumberPicker.

Bug: 9072003
Change-Id: Icbfa64f52cf11fd39c7243936227b8ba36280c3c
 2013-05-24 10:03:24 -07:00
Robert Greenwalt
f2eb6fbc0a am 36a151ab: Merge "Use the old interface when resetting connections" into jb-mr2-dev 
* commit '36a151abcd794524358a74599a1f4ab130ca7b55':
  Use the old interface when resetting connections
 2013-05-24 09:24:32 -07:00
Robert Greenwalt
36a151abcd Merge "Use the old interface when resetting connections" into jb-mr2-dev 2013-05-24 16:21:35 +00:00
Robert Greenwalt
80eb63b58b Use the old interface when resetting connections 
The new one is often null when disconnected, so using the new fails.
In other situations, it's the connections on the old network we want
to reset anyway, so the old code when it would work would also do
the wrong thing (unless new iface == old iface).

bug:9112928
Change-Id: I1fcae89cc3aa9d712e516e7c97cece0b89869bd9
 2013-05-23 18:33:06 -07:00
Deepanshu Gupta
279c00e8e0 Add missing native methods. 
Change-Id: I7b34e2ec0164520efc658053a80f307791a992b1
 2013-05-23 16:44:01 -07:00
Michael Wright
5e025eb1dc Pipe through bounding box information (DO NOT MERGE) 
Bug: 9110236
Change-Id: I7aefe6589fbaf92e5c71a0ba5425623578bafe95
 2013-05-23 15:06:47 -07:00
Amith Yamasani
6f114b891d Fix account filtering for specific package name 
Hacks to enable gms to see accounts were interfering with checking for
explicit package name.

Bug: 9095427
Change-Id: Iae65ea2a678d7403d023fa1a61c01347b77c3b5a
 2013-05-23 14:45:09 -07:00
Joe Fernandez
a44ff5034f am 62f47bc2: am 22689bc5: am a8b2186b: am a502c59e: docs: Add FileProvider to Support Library r13 Release Notes 
* commit '62f47bc29588e495a6f8efd082b34a92f8ec2098':
  docs: Add FileProvider to Support Library r13 Release Notes
 2013-05-23 14:08:51 -07:00
Joe Fernandez
62f47bc295 am 22689bc5: am a8b2186b: am a502c59e: docs: Add FileProvider to Support Library r13 Release Notes 
* commit '22689bc5e52a1c2f2d748440c0eeeebec17637c2':
  docs: Add FileProvider to Support Library r13 Release Notes
 2013-05-23 14:06:41 -07:00
Jim Miller
2f567679f4 am 2f48c4a7: Merge "Check for invalid pointer index in PagedView" into jb-mr2-dev 
* commit '2f48c4a754ce40a0854791c1f4ddf61458fffafc':
  Check for invalid pointer index in PagedView
 2013-05-23 14:05:21 -07:00
Joe Fernandez
22689bc5e5 am a8b2186b: am a502c59e: docs: Add FileProvider to Support Library r13 Release Notes 
* commit 'a8b2186b09a0f79b746d0fbab3611d95877af5fe':
  docs: Add FileProvider to Support Library r13 Release Notes
 2013-05-23 14:04:41 -07:00
Jim Miller
2f48c4a754 Merge "Check for invalid pointer index in PagedView" into jb-mr2-dev 2013-05-23 21:03:09 +00:00
Joe Fernandez
a8b2186b09 am a502c59e: docs: Add FileProvider to Support Library r13 Release Notes 
* commit 'a502c59e679c1b355d6ad3387449d82c590d84cf':
  docs: Add FileProvider to Support Library r13 Release Notes
 2013-05-23 14:01:23 -07:00
Andrew Wilson
f25b876c8d am 55bf965e: Merge "Compare binder instances when checking if listeners match." into jb-mr2-dev 
* commit '55bf965e89df5986a7a988c2b1ec2cd9f01edb56':
  Compare binder instances when checking if listeners match.
 2013-05-23 13:08:04 -07:00
Andrew Wilson
55bf965e89 Merge "Compare binder instances when checking if listeners match." into jb-mr2-dev 2013-05-23 18:47:48 +00:00
Chet Haase
1bf58a5a4c am cfbbc864: Merge "Restore previous alpha value on noop\'d DisplayList operations" into jb-mr2-dev 
* commit 'cfbbc864da1b7a9ed64807f9072c5730c421b4ef':
  Restore previous alpha value on noop'd DisplayList operations
 2013-05-23 11:25:34 -07:00
Chet Haase
cfbbc864da Merge "Restore previous alpha value on noop'd DisplayList operations" into jb-mr2-dev 2013-05-23 18:23:34 +00:00
Joe Fernandez
a502c59e67 docs: Add FileProvider to Support Library r13 Release Notes 
Change-Id: I9a87312f1bb5d4a18c720a9c3d3a558240450f6d
 2013-05-23 11:16:09 -07:00
kmccormick
e5f8b6ed87 am 5482b65a: am 88f24e6f: am 84fb096e: am e56e2483: am 7b1adeb8: am c6c149aa: Merge "Doc update: fix GCM TOC" into jb-mr1.1-docs 
* commit '5482b65ae8d3d02fa4b07a2221b3f00079c9aa80':
  Doc update: fix GCM TOC
 2013-05-23 11:01:50 -07:00
kmccormick
5482b65ae8 am 88f24e6f: am 84fb096e: am e56e2483: am 7b1adeb8: am c6c149aa: Merge "Doc update: fix GCM TOC" into jb-mr1.1-docs 
* commit '88f24e6fe8b854f43bebc77c891228a28a503cd9':
  Doc update: fix GCM TOC
 2013-05-23 10:56:56 -07:00
kmccormick
88f24e6fe8 am 84fb096e: am e56e2483: am 7b1adeb8: am c6c149aa: Merge "Doc update: fix GCM TOC" into jb-mr1.1-docs 
* commit '84fb096ee7a4f6d2af7dab6e18063ed029e0ff94':
  Doc update: fix GCM TOC
 2013-05-23 10:54:10 -07:00
kmccormick
84fb096ee7 am e56e2483: am 7b1adeb8: am c6c149aa: Merge "Doc update: fix GCM TOC" into jb-mr1.1-docs 
* commit 'e56e2483c57f9d6a12421ca7e124e7ec0e61f0ab':
  Doc update: fix GCM TOC
 2013-05-23 10:51:49 -07:00
kmccormick
e56e2483c5 am 7b1adeb8: am c6c149aa: Merge "Doc update: fix GCM TOC" into jb-mr1.1-docs 
* commit '7b1adeb80ae87e9eff90aa01bae35053fc74c66f':
  Doc update: fix GCM TOC
 2013-05-23 10:49:58 -07:00
kmccormick
7b1adeb80a am c6c149aa: Merge "Doc update: fix GCM TOC" into jb-mr1.1-docs 
* commit 'c6c149aa14610925158ef1ba6320c9356e45e631':
  Doc update: fix GCM TOC
 2013-05-23 10:47:13 -07:00