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

29570 Commits

Author SHA1 Message Date
Robert Greenwalt
85b5e4c48f am b5bf655c: am e874bd35: Merge "Add gservices updater for carrier provisioning url" into jb-mr2-dev 
* commit 'b5bf655cc6cc9128aec99958cce3b054348c9273':
  Add gservices updater for carrier provisioning url
 2013-07-19 13:37:41 -07:00
Elliott Hughes
03a152d7e7 am 15cb526e: Merge "Fix import after okhttp update." 
* commit '15cb526ece1420b1ae2061e20fd0982d82b41aae':
  Fix import after okhttp update.
 2013-07-18 09:36:48 -07:00
Narayan Kamath
c0bb16673e Fix import after okhttp update. 
OkResponseCache moved packages in change
62321.

Change-Id: I2c08c4586405e767d1931ebc5f185c7916850fa1
 2013-07-18 13:42:50 +01:00
Robert Greenwalt
e182bfe398 Add gservices updater for carrier provisioning url 
bug:9623159
Change-Id: I36697ed341353b7a3dbec5afe20241102e76f6f1
 2013-07-17 14:05:33 -07:00
Adam Powell
42658ed518 am 30ad7203: Merge "Consider mScrollX when drawing the checkMarkDrawable" 
* commit '30ad720304790b07112b87f973a7e6ed5e1e6ee5':
  Consider mScrollX when drawing the checkMarkDrawable
 2013-07-16 17:06:36 -07:00
Adam Powell
30ad720304 Merge "Consider mScrollX when drawing the checkMarkDrawable" 2013-07-17 00:04:28 +00:00
Adam Powell
45130c62e1 am 1dc3b790: am 4b8cc94c: Merge "PreferenceActivity should not leave message in looper when destroyed" 
* commit '1dc3b790df61aa95cb68da390045249c59049fcd':
  PreferenceActivity should not leave message in looper when destroyed
 2013-07-12 15:11:41 -07:00
Adam Powell
1dc3b790df am 4b8cc94c: Merge "PreferenceActivity should not leave message in looper when destroyed" 
* commit '4b8cc94cc67d760e724c56aee9301d1bcc2bbe89':
  PreferenceActivity should not leave message in looper when destroyed
 2013-07-12 15:09:54 -07:00
Hiroaki Kuriyama
1ebf13ef20 PreferenceActivity should not leave message in looper when destroyed 
When a PreferenceActivity is destroyed as soon as created,
there is a problematic case that messages for the activity are
sometimes left in the looper even after the activity is destroyed.
For example, by clearing user data of the selecting IME on
Settings apk, com.android.settings.Settings is re-launched
2 times successively. (Destory->Create->Destroy->Create)
Due to the left message, application crash can happen.
(NullPointerException at BackStackRecord.getBreadCrumbTitle())

Two cases have been found to observe this issue.
[Case 1]
 1,Launch IME in advance.
 2,Go to Settings >Apps > All and choose the IME package.
 3,Click "Clear data"
 4,Application crash occurs on com.android.settings.
[Case 2]
 1,Go to Settings > Language&input > Language.
 2,ListView dialog to choose language is shown.
 3,Rotate the tablet 180 degree so that 90 degree rotation occurs twice.
 4,Application crash occurs on com.android.settings.

Change-Id: I5ce36ea7a40ab7bc7737b7dca6641a4c3d77a480
 2013-07-12 15:42:35 +09:00
Jeff Sharkey
df04f64434 am f8b69275: am 1f99a483: Recover from corrupt network stats. 
* commit 'f8b692754f7739e11c8438ab59c0760194cfacc5':
  Recover from corrupt network stats.
 2013-07-11 11:41:24 -07:00
Jeff Sharkey
1f99a483e4 Recover from corrupt network stats. 
When encountering corrupt stats, throw as IOException to allow
recovery at a higher level.

Bug: 9794832
Change-Id: I38d000b3bd8a4c99389c40a87ee0699efb6e9049
 2013-07-11 11:18:53 -07:00
Elliott Hughes
dff4ec87e7 am e16a21c6: resolved conflicts for merge of 4a59376d to stage-aosp-master 
* commit 'e16a21c6b4f108813e5f5e00f30e0ff075de504c':
  Track libcore API change.
 2013-07-09 15:28:51 -07:00
Elliott Hughes
e16a21c6b4 resolved conflicts for merge of 4a59376d to stage-aosp-master 
Change-Id: I0e40180b46dc58781c218b8d382299dab73d49cc
 2013-07-09 15:25:23 -07:00
Elliott Hughes
befd0b1bdf Track libcore API change. 
Change-Id: Ib818a7f21325c5f918bf497033a90d76b25ec9e7
 2013-07-09 14:46:18 -07:00
Jean-Baptiste Queru
9058a6c881 am 7e683ec6: am fa42e774: Merge "FastScroller: Fix to use appropriate index" 
* commit '7e683ec6a53b1581671ce72782e7b25a0ae705d0':
  FastScroller: Fix to use appropriate index
 2013-07-08 14:43:01 -07:00
Jean-Baptiste Queru
7e683ec6a5 am fa42e774: Merge "FastScroller: Fix to use appropriate index" 
* commit 'fa42e774bc48c3172023c8c49610baa469c19e39':
  FastScroller: Fix to use appropriate index
 2013-07-08 14:28:45 -07:00
Jean-Baptiste Queru
fa42e774bc Merge "FastScroller: Fix to use appropriate index" 2013-07-08 21:24:06 +00:00
Jean-Baptiste Queru
db550fc900 am 0e545bf5: am 9775203b: Merge "SectionIndexer: Update Javadoc for ExpandableListAdapters" 
* commit '0e545bf5502fde4fe2c96377829bd4c3f7c2d727':
  SectionIndexer: Update Javadoc for ExpandableListAdapters
 2013-07-08 12:40:28 -07:00
Jean-Baptiste Queru
0e545bf550 am 9775203b: Merge "SectionIndexer: Update Javadoc for ExpandableListAdapters" 
* commit '9775203b610267bf8cecaf7c00db68b73b529ced':
  SectionIndexer: Update Javadoc for ExpandableListAdapters
 2013-07-08 12:37:27 -07:00
Jean-Baptiste Queru
9775203b61 Merge "SectionIndexer: Update Javadoc for ExpandableListAdapters" 2013-07-08 19:35:36 +00:00
Jean-Baptiste Queru
51ec7f3725 am da52b9a2: am 8113b17c: Merge "Fixed incorrect calculation of dirty invalidation area" 
* commit 'da52b9a28756e67daa03654953678dfa08e0ca5d':
  Fixed incorrect calculation of dirty invalidation area
 2013-07-02 15:00:01 -07:00
Jean-Baptiste Queru
da52b9a287 am 8113b17c: Merge "Fixed incorrect calculation of dirty invalidation area" 
* commit '8113b17c473367bd1be7db707fc5b94121cb09e5':
  Fixed incorrect calculation of dirty invalidation area
 2013-07-02 14:58:22 -07:00
Wink Saville
3b5d686e68 am c45f2e05: am 59046f40: Merge "Add checkMobileProvisioning to ConnectivityService." into jb-mr2-dev 
* commit 'c45f2e05e3b9d261009c66346ef2257ec105f05c':
  Add checkMobileProvisioning to ConnectivityService.
 2013-07-01 15:41:31 -07:00
Wink Saville
59046f40ba Merge "Add checkMobileProvisioning to ConnectivityService." into jb-mr2-dev 2013-07-01 22:36:48 +00:00
Johan Viktorsson
e9018f7716 Fixed incorrect calculation of dirty invalidation area 
Padding was already taken into consideration before calling
invalidateDrawable in ProgressBar.

Change-Id: Id7f23bd15bb19e2294c07adb2acb397100ea97e8
 2013-07-01 13:43:19 +09:00
Wink Saville
ab9321d13d Add checkMobileProvisioning to ConnectivityService. 
Bug: 9279964
Change-Id: I42c326a21e05aa301e9d974ed9ac1d59472780ec
 2013-06-29 21:10:57 -07:00
Elliott Hughes
b8292830f7 resolved conflicts for merge of a920f25f to jb-mr2-dev-plus-aosp 
Change-Id: I3349f8d2e6715171e2677c1385122ceb2810c1f6
 2013-06-28 16:50:13 -07:00
Elliott Hughes
a920f25fe5 resolved conflicts for merge of fca0f92e to stage-aosp-master 
Change-Id: I4791f0ffa324a313b8390fbde6d8f82f716ecf74
 2013-06-28 16:41:19 -07:00
Elliott Hughes
d396a448b2 Switch frameworks/base over from @hidden Charsets to public StandardCharsets. 
Bug: 3484927
Change-Id: I5d136d2ee629588538602766a182ae14ce5fc63c
 2013-06-28 16:24:48 -07:00
Kenny Root
67f7d8fbd5 am 6c042b6d: am a5a2de55: Merge "Add ALPN support to SSL socket factory" 
* commit '6c042b6d678edea0f936da994f85ba62f9a1950e':
  Add ALPN support to SSL socket factory
 2013-06-27 14:55:41 -07:00
Romain Guy
dbfb2ab4a7 am 93d46952: am 67603c6e: Recreate TextureView\'s display list on attach Bug #9425270 
* commit '93d46952db60090ae22bc8197659a06ae23cb58b':
  Recreate TextureView's display list on attach Bug #9425270
 2013-06-27 14:52:33 -07:00
Kenny Root
6c042b6d67 am a5a2de55: Merge "Add ALPN support to SSL socket factory" 
* commit 'a5a2de55082b1f2a9ec0b99962a88063ac6d1bbf':
  Add ALPN support to SSL socket factory
 2013-06-27 14:52:17 -07:00
Kenny Root
a5a2de5508 Merge "Add ALPN support to SSL socket factory" 2013-06-27 21:25:24 +00:00
Romain Guy
67603c6e1b Recreate TextureView's display list on attach 
Bug #9425270

When a TextureView is detached from its window and immediately
re-attached, the display list is not destroyed but reused as is.
TextureView will however destroy the layer and surface texture
reference by the display list.

The solution is to force TextureView to invalidate its display
list on re-attach if it previously had a surface/layer pair.

Change-Id: I475096ffa7e5709155c4c943bf1bfaaaedbd4a1d
 2013-06-27 10:58:10 -07:00
Kenny Root
100d729026 Add ALPN support to SSL socket factory 
This adds the ability to use Application-Layer Protocol Negotiation
(ALPN) through the SSLCertificateSocketFactory. ALPN is essentially
like Next Protocol Negotiation (NPN) but negotiation is done in the
clear. This allows the use of other protocols on the same port (e.g.,
SPDY instead of HTTP on port 80).

Change-Id: Ie62926b455e252c4c98670bbbecc1eb5c6f13990
 2013-06-26 10:35:39 -07:00
John Reck
52dbdbf2d1 am 9d2b0dbf: am 12c4c0e4: Merge "Fix deadlock of WebViewCoreThread" 
* commit '9d2b0dbf67844ead1a0aeb22e1e3097d2ec60171':
  Fix deadlock of WebViewCoreThread
 2013-06-25 15:34:16 -07:00
John Reck
9d2b0dbf67 am 12c4c0e4: Merge "Fix deadlock of WebViewCoreThread" 
* commit '12c4c0e45b12be18005f0ad2af2433e34dcb1a9f':
  Fix deadlock of WebViewCoreThread
 2013-06-25 15:31:39 -07:00
John Reck
12c4c0e45b Merge "Fix deadlock of WebViewCoreThread" 2013-06-25 22:28:02 +00:00
kmccormick
30c8973f66 am 75c59fb9: am dc22fa92: Merge "Doc change: new Bluetooth LE doc" into jb-mr2-dev 
* commit '75c59fb9d9a1408146165300eae0899a965897bf':
  Doc change: new Bluetooth LE doc
 2013-06-21 16:31:41 -07:00
kmccormick
dc22fa924a Merge "Doc change: new Bluetooth LE doc" into jb-mr2-dev 2013-06-21 23:00:18 +00:00
kmccormick
f14ff1c9ce Doc change: new Bluetooth LE doc 
Change-Id: Ib6d67497a9b4d54d13b4da8f1f9ee991bc5ef562
 2013-06-21 14:52:05 -07:00
Scott Main
8303a2036e am 94ba190e: am de04dfb6: Merge "some extra docs for TextDirectionHeuristic" into jb-mr2-dev 
* commit '94ba190ebbd4fe7f8933d531cce7b4be8e04f287':
  some extra docs for TextDirectionHeuristic
 2013-06-17 22:13:17 -07:00
Scott Main
e442662330 some extra docs for TextDirectionHeuristic 
Change-Id: I8ceac72a76a29bde0e25ed418110a6e4120654e3
 2013-06-17 19:05:29 -07:00
Scott Main
ea8935362d am c4473d10: am 27a8508e: add attributes reference for splimotionevents and layoutmode 
* commit 'c4473d10ed747fb1e84efff7183023e0ecc1a493':
  add attributes reference for splimotionevents and layoutmode
 2013-06-17 18:39:18 -07:00
Scott Main
27a8508ee1 add attributes reference for splimotionevents and layoutmode 
Change-Id: Id78f2957c994fc30a0837084f22766c8cfa70fe8
 2013-06-18 01:33:33 +00:00
Elliott Hughes
704dfbfec4 am 48fa06f3: am f6a67139: Merge "Correct Date format for el_GR, sv_SE and tr_TR locales" 
* commit '48fa06f34fe3098fd820b97d9d28c9f27f8591de':
  Correct Date format for el_GR, sv_SE and tr_TR locales
 2013-06-17 13:41:24 -07:00
Elliott Hughes
48fa06f34f am f6a67139: Merge "Correct Date format for el_GR, sv_SE and tr_TR locales" 
* commit 'f6a671394ca3d269835d5f5b882b46f9539e9a96':
  Correct Date format for el_GR, sv_SE and tr_TR locales
 2013-06-17 13:38:59 -07:00
howardb
5ad2451f9f Correct Date format for el_GR, sv_SE and tr_TR locales 
Amend DateFormat.getDateFormat to CLDR data from icu4c
instead of locale specific resource entries which are incorrect
for several locales.

No CTS tests are added as they require changing the locale which
is not currently possible.

Bug: https://code.google.com/p/android/issues/detail?id=56385

Change-Id: Ibd11c7fd9b595e19a3e2bf508e1585aa50067e03
Signed-off-by: howardb <android@howardb.com>
 2013-06-17 13:35:29 -07:00
Scott Main
695be87d6e am 92053f8b: revise docs for new sensor types. fix markup error causing tons of code font 
* commit '92053f8b28ce0d035d292fa73622200990682511':
  revise docs for new sensor types. fix markup error causing tons of code font
 2013-06-14 08:45:20 -07:00
Scott Main
92053f8b28 revise docs for new sensor types. fix markup error causing tons of code font 
Change-Id: I7635bbc44e03b50faeddf5c5fe50f7f47e2cde35
 2013-06-13 16:37:51 -07:00