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

178457 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sarah Maddox
a158abe454 Merge "docs: Updates lesson 1 of location API training: Get last-known location." into lmp-docs 2014-12-15 20:42:40 +00:00
Paul Jensen
f4ffaa4f57 Fix race between CONNECTIVITY_ACTION and setting default network. 
Now that the delay between connectivity changes and CONNECTIVITY_ACTION
has been removed (ag/599650) races between CONNECTIVITY_ACTION and
the setting of the default network become more evident.
In http://crbug.com/441818 Chrome is calling getaddrinfo()
immediately after a device goes from no connectivity to cellular
connectivity, and Chrome is erroneously getting back EAI_NODATA
because netd hasn't yet set the default network for DNS resolutions.

bug:18757162
Change-Id: Ib607dcb3697403272a8c838713a9cb602e9c6820
 2014-12-15 15:20:30 -05:00
Alan Viverette
43cd1ddc81 Merge "Prune the resource cache before adding new caches" 2014-12-15 20:03:10 +00:00
Jorim Jaggi
613fffcd0f Merge "Revert "Revert "Attempt to fix keyguard missing bug""" into lmp-mr1-dev 2014-12-15 19:56:45 +00:00
Elliott Hughes
c4e9215fa5 am 2a6426c9: am e9e1e0d2: Merge "Reimplement reopenStdio in Java." 
automerge: 3e8484c

* commit '3e8484c3f7f615c4b3f1cb925c4164d513cc0e97':
  Reimplement reopenStdio in Java.
 2014-12-15 19:39:58 +00:00
Elliott Hughes
3e8484c3f7 am 2a6426c9: am e9e1e0d2: Merge "Reimplement reopenStdio in Java." 
* commit '2a6426c900d319c7b928242694ad050a73ad324b':
  Reimplement reopenStdio in Java.
 2014-12-15 19:38:04 +00:00
Elliott Hughes
2a6426c900 am e9e1e0d2: Merge "Reimplement reopenStdio in Java." 
* commit 'e9e1e0d20f1f7bae11f5df74d14c7b1be4edc8ac':
  Reimplement reopenStdio in Java.
 2014-12-15 19:30:56 +00:00
Amit Mahajan
33dba3d4d3 am 2fab5307: am d060b50b: Merge "Change to treat slotId 0 emergency numbers as default." into lmp-mr1-dev 
automerge: 98cc133

* commit '98cc133f077ba393d6c9a6e302c3e89ade64247f':
  Change to treat slotId 0 emergency numbers as default.
 2014-12-15 19:28:43 +00:00
Amit Mahajan
98cc133f07 am 2fab5307: am d060b50b: Merge "Change to treat slotId 0 emergency numbers as default." into lmp-mr1-dev 
* commit '2fab5307d1983b0415b7eeb79779ecaee7b67ea1':
  Change to treat slotId 0 emergency numbers as default.
 2014-12-15 19:27:10 +00:00
Elliott Hughes
e9e1e0d20f Merge "Reimplement reopenStdio in Java." 2014-12-15 19:24:53 +00:00
Alan Viverette
39a72dd207 Clean up ViewStub inflation to ensure it has resources 
BUG: 18642716
Change-Id: I52be9d379672ef143cd385c78a8e0744225de4ae
 2014-12-15 11:23:57 -08:00
Amit Mahajan
2fab5307d1 am d060b50b: Merge "Change to treat slotId 0 emergency numbers as default." into lmp-mr1-dev 
* commit 'd060b50b331f540d42c91501d820e3c2601dec18':
  Change to treat slotId 0 emergency numbers as default.
 2014-12-15 19:19:06 +00:00
Vinit Deshpande
c4f389e122 New Additions to WifiScanner APIs 
Added single shot scan, and maxScansToCache. Also fixed getScanResults()
to report scan results to listeners.

Bug: 18087596
Bug: 17694040
Bug: 18059273

Change-Id: I8a6da5426561e22e72d1e99c5537205b893077dd
 2014-12-15 11:14:45 -08:00
Vinit Deshpande
1265a98965 Introduce onLost event on bssid hotlist 
Change-Id: I84c3174398fea9a1456fb007586c2c559dd3fe4d
 2014-12-15 11:14:45 -08:00
Jim Miller
a8800f7c27 Revert "Revert "Attempt to fix keyguard missing bug"" 
This reverts commit 1991590ddd0ca6d3a0cac290b65120c147034dbc
and fixes a bug where we were showing the scrim on devices without keyguard.

Bug: 18468369
Change-Id: Idce1370dadacd09c4a8f1a7fd9728c23b218d19c
 2014-12-15 20:12:09 +01:00
Amit Mahajan
d060b50b33 Merge "Change to treat slotId 0 emergency numbers as default." into lmp-mr1-dev 2014-12-15 19:06:48 +00:00
Elliott Hughes
dac83f5e6a Reimplement reopenStdio in Java. 
Bug: 18719692
Change-Id: I4ed984cd6148c5cba75d46a60f32a0687a5bcac3
 2014-12-15 11:00:25 -08:00
Amit Mahajan
d9835f0c16 Change to treat slotId 0 emergency numbers as default. 
Emergency numbers are slot specific. This change is to read emergency
numbers for slotId 0 if slotId is unknown/invalid.

Bug: 18656027
Change-Id: Ibaeb720955f6abc421b84d3cb32eb812b6c55a34
 2014-12-15 10:38:27 -08:00
Geoff Mendal
12647d923d Merge "Import translations. DO NOT MERGE" 2014-12-15 18:23:04 +00:00
Marvin Paul
111d166017 Merge "Implemented backup and restore for account sync settings." 2014-12-15 18:22:46 +00:00
smain@google.com
c21b4553cb am 16d9a037: am 68e6819b: brute force improve suggestions for sdk download 
* commit '16d9a0378fb1c8fbefb263df2e3d627202ae677d':
  brute force improve suggestions for sdk download
 2014-12-15 18:19:05 +00:00
Todd Kennedy
539db51a7d propagate reason to finishActivityLocked() 
Bug: 18704347
Change-Id: I830ad08f344db5be99760e0112d96729077b29c6
 2014-12-15 10:11:35 -08:00
smain@google.com
16d9a0378f am 68e6819b: brute force improve suggestions for sdk download 
* commit '68e6819bd023d24894fc7cbb2357c685177d9b84':
  brute force improve suggestions for sdk download
 2014-12-15 18:10:45 +00:00
Geoff Mendal
ea34eb0f89 Import translations. DO NOT MERGE 
Change-Id: I82675c345db8ce5b5c4d6ac94e2af91ae9dcfca1
Auto-generated-cl: translation import
 2014-12-15 10:09:53 -08:00
Guang Zhu
3d5cf2a1f2 Merge "Reapply: Add generated source dependency for Jack compilation." 2014-12-15 18:09:36 +00:00
smain@google.com
68e6819bd0 brute force improve suggestions for sdk download 
Change-Id: I4698058a12472a65e67cadc3d0e3dd1ffed1b384
 2014-12-15 10:00:59 -08:00
Alan Viverette
4ae0d9045f am 2f11125a: am 9973643b: Merge "Give accessibility delegate the first pass at handling ACTION_CLICK" into lmp-mr1-dev 
automerge: 878a5a6

* commit '878a5a6cd7109183928b9b8b533f11347fd0591a':
  Give accessibility delegate the first pass at handling ACTION_CLICK
 2014-12-15 17:41:55 +00:00
Alan Viverette
f19ef0fdc3 am 2311ded6: am 2649c58b: Merge "Avoid self-recursion if client calls init() from date listener" into lmp-mr1-dev 
automerge: 37ea640

* commit '37ea640fa9e8de304ce5f9c9576e370baa85929e':
  Avoid self-recursion if client calls init() from date listener
 2014-12-15 17:40:42 +00:00
Alan Viverette
878a5a6cd7 am 2f11125a: am 9973643b: Merge "Give accessibility delegate the first pass at handling ACTION_CLICK" into lmp-mr1-dev 
* commit '2f11125a7186cc65713804c939a0e538538d9f35':
  Give accessibility delegate the first pass at handling ACTION_CLICK
 2014-12-15 17:38:25 +00:00
Alan Viverette
37ea640fa9 am 2311ded6: am 2649c58b: Merge "Avoid self-recursion if client calls init() from date listener" into lmp-mr1-dev 
* commit '2311ded6a3da117aee221c0cf1168c24160d9041':
  Avoid self-recursion if client calls init() from date listener
 2014-12-15 17:38:19 +00:00
Alan Viverette
2f11125a71 am 9973643b: Merge "Give accessibility delegate the first pass at handling ACTION_CLICK" into lmp-mr1-dev 
* commit '9973643bfc123fcc73803542ef8cb74e243907ce':
  Give accessibility delegate the first pass at handling ACTION_CLICK
 2014-12-15 17:31:36 +00:00
Alan Viverette
2311ded6a3 am 2649c58b: Merge "Avoid self-recursion if client calls init() from date listener" into lmp-mr1-dev 
* commit '2649c58b460c2cd841173a8db513a54180422330':
  Avoid self-recursion if client calls init() from date listener
 2014-12-15 17:31:31 +00:00
Alan Viverette
9973643bfc Merge "Give accessibility delegate the first pass at handling ACTION_CLICK" into lmp-mr1-dev 2014-12-15 17:27:24 +00:00
Alan Viverette
2649c58b46 Merge "Avoid self-recursion if client calls init() from date listener" into lmp-mr1-dev 2014-12-15 17:26:39 +00:00
Christoph Studer
5c510ee551 Notification: Fix bigLargeIcon 
Fix a bug in L where BigPictureStyle.bigLargeIcon never made it
into the notification layout.

Bug: 18735551
Change-Id: Ia72d1de8cca2e95df3a99aaffeaba31325f1d858
 2014-12-15 17:00:14 +01:00
smain@google.com
0baa12cee3 Merge "followup fix to conflict resolution in Change-Id: I9cc71d672141c23c0c2ed0a73d3e80aac10f3eb6" 2014-12-15 15:56:55 +00:00
Alexandra Gherghina
80d119bf65 Fix image conversion 
For some images, especially those in the bug linked, the conversion would
yield empty images otherwise.

Bug: 18311493
Change-Id: I90150a8837655df3c9c35b36eb02594807eb0a06
 2014-12-15 15:51:47 +00:00
smain@google.com
5d0766a80e followup fix to conflict resolution in Change-Id: I9cc71d672141c23c0c2ed0a73d3e80aac10f3eb6 
Change-Id: I5796348197732f6c9e72fcbdbca5fcd4934f8994
 2014-12-15 07:39:52 -08:00
Geoff Mendal
d1141978f5 am 301a6176: (-s ours) am d6fc7cf1: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
automerge: 7f2116d  -s ours

* commit '7f2116d1dbe1099fc44c0ad57cd5efdc4a9583d9':
  Import translations. DO NOT MERGE
 2014-12-15 15:27:09 +00:00
Geoff Mendal
7f2116d1db am 301a6176: (-s ours) am d6fc7cf1: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '301a617698e74bb413df52f93ea7908a33423250':
  Import translations. DO NOT MERGE
 2014-12-15 15:25:44 +00:00
Geoff Mendal
6b873a0db1 am b73e02cf: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
automerge: ea96415  -s ours

* commit 'ea964156460bbe8ab8f03c8de5f9f529234d69ce':
  Import translations. DO NOT MERGE
 2014-12-15 15:20:08 +00:00
Geoff Mendal
301a617698 am d6fc7cf1: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'd6fc7cf149795abdcd0629e229be52b816ee13c1':
  Import translations. DO NOT MERGE
 2014-12-15 15:17:58 +00:00
Geoff Mendal
ea96415646 am b73e02cf: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit 'b73e02cf5c736a944155b9d4586d8e8a6e40dc6e':
  Import translations. DO NOT MERGE
 2014-12-15 15:17:39 +00:00
Geoff Mendal
38706fc799 Merge "Import translations. DO NOT MERGE" 2014-12-15 15:11:37 +00:00
Geoff Mendal
b73e02cf5c Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-12-15 15:11:25 +00:00
Geoff Mendal
d6fc7cf149 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-12-15 15:10:39 +00:00
Geoff Mendal
1d60e76c5e Import translations. DO NOT MERGE 
Change-Id: Ib24c34c76cbfdc490acb59d462a8c920a22139b2
Auto-generated-cl: translation import
 2014-12-15 07:02:33 -08:00
Geoff Mendal
2cbfbf22d5 Merge "Import translations. DO NOT MERGE" 2014-12-15 15:00:29 +00:00
Geoff Mendal
099cce32d2 Import translations. DO NOT MERGE 
Change-Id: I1631f2d7e5eca790da4ce7b78e90c626f96be23c
Auto-generated-cl: translation import
 2014-12-15 06:56:40 -08:00
Geoff Mendal
111a81669e Import translations. DO NOT MERGE 
Change-Id: I18accc4c251f9f5bbaa69512b317898637daed64
Auto-generated-cl: translation import
 2014-12-15 06:50:18 -08:00