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

189237 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
0cdb63213e Merge "Import translations. DO NOT MERGE" 2015-04-22 12:40:00 +00:00
Geoff Mendal
fb13b1a25d Import translations. DO NOT MERGE 
Change-Id: Ic171492db55349ae11e8c83cee37f53c1bf1f349
Auto-generated-cl: translation import
 2015-04-22 05:39:05 -07:00
Geoff Mendal
1edd3aa997 Merge "Import translations. DO NOT MERGE" 2015-04-22 12:32:13 +00:00
Geoff Mendal
b83bf8330f Import translations. DO NOT MERGE 
Change-Id: Ifd3267e13368e7c6deccb173e90b65c5c7a526f6
Auto-generated-cl: translation import
 2015-04-22 05:30:32 -07:00
Geoff Mendal
af11fc17b7 Merge "Import translations. DO NOT MERGE" 2015-04-22 12:28:57 +00:00
Geoff Mendal
6fa9148e5e Import translations. DO NOT MERGE 
Change-Id: If4919373256f7d4e74072e4c34fcfbc36bad6825
Auto-generated-cl: translation import
 2015-04-22 05:27:09 -07:00
Geoff Mendal
910c5426fa Merge "Import translations. DO NOT MERGE" 2015-04-22 12:26:45 +00:00
Geoff Mendal
409d7b2449 Merge "Import translations. DO NOT MERGE" 2015-04-22 12:25:30 +00:00
Geoff Mendal
4614991d85 Import translations. DO NOT MERGE 
Change-Id: Ib1c155c8eedd0773a5d973813665792e749dd458
Auto-generated-cl: translation import
 2015-04-22 05:24:05 -07:00
Geoff Mendal
79bd3bb8ef Merge "Import translations. DO NOT MERGE" 2015-04-22 12:24:05 +00:00
Geoff Mendal
e58224f266 Import translations. DO NOT MERGE 
Change-Id: I0893584e89cfc86caea9f5f5f43f8d7dd94873d8
Auto-generated-cl: translation import
 2015-04-22 05:20:51 -07:00
Geoff Mendal
964ced6423 Merge "Import translations. DO NOT MERGE" 2015-04-22 12:19:52 +00:00
Geoff Mendal
ad8bdc9fae Import translations. DO NOT MERGE 
Change-Id: I74dde9cd7fb513553a5da3614ff24724db011042
Auto-generated-cl: translation import
 2015-04-22 05:17:28 -07:00
Geoff Mendal
9ad72222be Import translations. DO NOT MERGE 
Change-Id: I12b2928b11ea4ed7111e7c36753192ac07fee8d4
Auto-generated-cl: translation import
 2015-04-22 05:14:12 -07:00
Geoff Mendal
b8e8746e23 Import translations. DO NOT MERGE 
Change-Id: Ibe34266cd7076ba077fae3f629eeda6c4bc583cf
Auto-generated-cl: translation import
 2015-04-22 05:10:53 -07:00
Benjamin Franz
07ba37a713 Merge "Recover status bar enabled state for all users" 2015-04-22 11:43:03 +00:00
Benjamin Franz
6d6290d282 Merge "Check for null packages in setLockTaskPackages" 2015-04-22 11:00:02 +00:00
Benjamin Franz
837f1035a6 Recover status bar enabled state for all users 
Move the update of status bar enabled setting to loadSettingsLocked and
thereby recovering the enabled state for all users, not only the user
owner.

Bug: 20416833
Change-Id: Iee3d6e0f3ea8ebc5d72c0ed165bea4595ed073ba
 2015-04-22 11:44:57 +01:00
Martijn Coenen
8abf680e00 Add NFC APIs for dynamic resources. 
For new Tap & Pay settings UX.

Change-Id: I55ff4e4d4a4b6d26c3c88d96431c4f14d0963323
 2015-04-22 11:56:36 +02:00
Andrei Stingaceanu
c649dae8e0 Merge "Cleanup unused icons on the floating toolbar." 2015-04-22 09:25:31 +00:00
Svet Ganov
16a6725b41 Merge "Fix permission check imposed by broadcast sender." 2015-04-22 09:16:18 +00:00
Svet Ganov
4f2dcfd480 Fix permission check imposed by broadcast sender. 
Change-Id: Id105b00aad7b369fa0337fa63753ce7ea71b3383
 2015-04-22 02:14:47 -07:00
Keisuke Kuroyanagi
6eb7227188 Merge "Stop showing "Replace" when selection isn't inside spans." 2015-04-22 08:31:18 +00:00
Lorenzo Colitti
f443bfc25e Always send the DHCP client identifier. 
Currently we send it only in request packets, but not in discover
packets. This might confuse servers because they might think that
the discover and the request come from different clients.

Also reorder the options in the request packet to match the order
used by the legacy DHCP client.

While I'm at it, fix the generation code for inform and decline
packets, which we do not use.

Bug: 19704592
Bug: 20335221
Change-Id: I1d45306e76dbd5da9cc4611e6df84a9f67346b2c
 2015-04-22 16:44:10 +09:00
Keisuke Kuroyanagi
05fd8d50b2 Stop showing "Replace" when selection isn't inside spans. 
Currently, "Replace" is shown when any spans intersects
the selection. It causes confusing behavior when multiple
words are selected. "Replace" is in the ActionBar, but it's
unclear which word will be replaced. It can happen when
text is selected using long tap + drag, unig keyboard, or
using a mouse.

Bug: 19396964
Change-Id: I512f5f566d4060cd0aa7b28594054bf4f6bf7458
 2015-04-22 15:33:27 +09:00
Lorenzo Colitti
7428de1950 Merge "Log DHCP replies that we can't parse." 2015-04-22 04:12:14 +00:00
Lorenzo Colitti
a94929ba9d Log DHCP replies that we can't parse. 
Bug: 19704592
Bug: 20335221
Change-Id: I73def02a08345bd96f45cb970f9f251e6d5df2db
 2015-04-22 04:09:55 +00:00
Lorenzo Colitti
ac6724b6e5 Merge "Don't require ACCESS_NETWORK_STATE in setProcessDefaultNetwork" 2015-04-22 04:04:56 +00:00
Lorenzo Colitti
1dc1c9a7b1 Merge "Allow apps with ACCESS_WIFI_STATE to listen for wifi networks" 2015-04-22 04:04:28 +00:00
Lorenzo Colitti
ec4c555571 Don't require ACCESS_NETWORK_STATE in setProcessDefaultNetwork 
The documentation for setProcessDefaultNetwork does not
mention that it requires ACCESS_NETWORK_STATE, but a process
without ACCESS_NETWORK_STATE that calls it will crash because
we can't fetch the proxy properties.

Because ACCESS_NETWORK_STATE is not required to obtain a Network
object (Network objects can come from broadcasts too), it may not
be reasonable to require the permission. We did not do so in L.

For now, ignore the failure and don't crash the app. I've filed
http://b/20470604 to track a longer term fix.

Bug: 20081183
Bug: 20423580
Bug: 20470604
Change-Id: I158016130b4afb1d300357fe703804d2e7bc609b
 2015-04-22 12:27:33 +09:00
Tingting Wang
e0aac80b9b Merge "Add MetadataSync table to ContactsContract." 2015-04-22 03:25:56 +00:00
Lorenzo Colitti
fa57c489f6 Allow apps with ACCESS_WIFI_STATE to listen for wifi networks 
The compatibility measure introduced in bug 20081183 for apps
that connect to a Wi-Fi network without Internet access and then
expect to be able to use that network requires that such apps
register a NetworkCallback so that their WifiManager can pin them
to whatever wifi Network connects.

Currently, registering the callback requires ACCESS_NETWORK_STATE
and the app may not have that permission. Allow registering wifi
(only) callbacks if the app has ACCESS_WIFI_STATE.

If the app does not have ACCESS_WIFI_STATE (unlikely, since
CHANGE_WIFI_STATE is not very useful without ACCESS_WIFI_STATE),
then don't enable the compatibility measure.

Bug: 20081183
Bug: 20423580
Change-Id: Iad328d30c2d170dead883868fece3d922da68f6f
 2015-04-22 12:01:35 +09:00
Svetoslav
8b625dbe7f Merge "Report all permissions by type correctly" 2015-04-22 01:43:35 +00:00
fenglu
b32243498f Merge "update API name to requestBandwidthUpdate()" 2015-04-22 01:32:19 +00:00
Justin Koh
44e332ce81 am 59338950: (-s ours) am ba75135a: am 2aa3905c: Merge "DO NOT MERGE: The ValueAnimator\'s state need to be totally reset during clone." into lmp-mr1-modular-dev 
* commit '593389501fb3f291eb4b1de4b995318c1ac458b0':
  DO NOT MERGE: The ValueAnimator's state need to be totally reset during clone.
 2015-04-22 01:07:42 +00:00
ztenghui
22580f0c80 am 2947926c: (-s ours) am 059451e1: am 23606598: DO NOT MERGE: Reset the Node status when clone. 
* commit '2947926ce8f15417cebaad936482fc7c18957eaa':
  DO NOT MERGE: Reset the Node status when clone.
 2015-04-22 01:07:36 +00:00
Justin Koh
593389501f am ba75135a: am 2aa3905c: Merge "DO NOT MERGE: The ValueAnimator\'s state need to be totally reset during clone." into lmp-mr1-modular-dev 
* commit 'ba75135a807c87f4d6c14e69b1246eabd39f4117':
  DO NOT MERGE: The ValueAnimator's state need to be totally reset during clone.
 2015-04-22 00:53:38 +00:00
ztenghui
2947926ce8 am 059451e1: am 23606598: DO NOT MERGE: Reset the Node status when clone. 
* commit '059451e18504d6fbbedacaeefe0f2b62b355104d':
  DO NOT MERGE: Reset the Node status when clone.
 2015-04-22 00:53:34 +00:00
Svetoslav
1b7025f264 Report all permissions by type correctly 
Change-Id: I357ad52d022ffd7703cce7e1551fa10cc7edd72f
 2015-04-21 17:52:17 -07:00
Justin Koh
ba75135a80 am 2aa3905c: Merge "DO NOT MERGE: The ValueAnimator\'s state need to be totally reset during clone." into lmp-mr1-modular-dev 
* commit '2aa3905cb0cc595783ab43b0bc7a4b3818003958':
  DO NOT MERGE: The ValueAnimator's state need to be totally reset during clone.
 2015-04-22 00:43:16 +00:00
ztenghui
059451e185 am 23606598: DO NOT MERGE: Reset the Node status when clone. 
* commit '23606598244c2a297d994895eaf631b240d33242':
  DO NOT MERGE: Reset the Node status when clone.
 2015-04-22 00:43:08 +00:00
Vinit Deshpande
0e71f9b23b Merge "Turn of WifiScanner's debug logging" 2015-04-22 00:35:29 +00:00
Justin Koh
2aa3905cb0 Merge "DO NOT MERGE: The ValueAnimator's state need to be totally reset during clone." into lmp-mr1-modular-dev 2015-04-22 00:31:00 +00:00
Andreas Gampe
0db3cdc59a am 5b0c0964: am fb861b6c: am 31fb202e: Merge "Frameworks/base: Compile-time optimize SQLiteConnection" 
* commit '5b0c0964d843319b1b89767cd3d3f1daa984df51':
  Frameworks/base: Compile-time optimize SQLiteConnection
 2015-04-22 00:23:51 +00:00
Andreas Gampe
5b0c0964d8 am fb861b6c: am 31fb202e: Merge "Frameworks/base: Compile-time optimize SQLiteConnection" 
* commit 'fb861b6c8d255fc31f3460e39681a4fee35f156b':
  Frameworks/base: Compile-time optimize SQLiteConnection
 2015-04-22 00:12:30 +00:00
fenglu
db57147a55 update API name to requestBandwidthUpdate() 
Change-Id: If26942978ffcc43f06f17dfad5da790f34758395
 2015-04-21 17:12:05 -07:00
Mathieu Chartier
7651dec5c9 am 097e1cdf: am 765d7c30: am ba6783b6: Merge "Update getExportedPropertyMethods to new reflection API" 
* commit '097e1cdfb8f3520b22eafb2f0a7458010b1b3415':
  Update getExportedPropertyMethods to new reflection API
 2015-04-22 00:00:23 +00:00
Andreas Gampe
825af5fba9 am 5d3aea2e: am c7f9f765: am 189d2785: Merge "Frameworks/base: Fix comment" 
* commit '5d3aea2e5d052041a81bf49154ceedb9d96e2918':
  Frameworks/base: Fix comment
 2015-04-22 00:00:15 +00:00
Andreas Gampe
fb861b6c8d am 31fb202e: Merge "Frameworks/base: Compile-time optimize SQLiteConnection" 
* commit '31fb202e6f6687f86ec4fc33b18aafacbf67c797':
  Frameworks/base: Compile-time optimize SQLiteConnection
 2015-04-21 23:59:57 +00:00
Robert Greenwalt
bba3270c34 Merge "Revert "requestBwUpdate() public API review"" 2015-04-21 23:59:35 +00:00