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

249291 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tyler Gunn
b822f7a956 Merge "Enhance toString on ConferenceParticipant." into nyc-mr1-dev 2016-07-18 20:13:32 +00:00
Mark Lu
a5e5cf6a84 Merge \"docs: remove trailing white space from jd files\" into nyc-dev 
am: 242f5798ac

Change-Id: I6d0c57812a6af0663f483a26aa037a85cd84838c
 2016-07-18 19:55:28 +00:00
Mark Lu
242f5798ac Merge "docs: remove trailing white space from jd files" into nyc-dev 2016-07-18 19:48:52 +00:00
Adam Lesinski
5f056f6d87 Record UID of wakeup packets 
Bug:28931278
Change-Id: I50a3b6a8026b4d06aaa2730cd531658d280ddb73
 2016-07-18 12:30:46 -07:00
smain@google.com
6e446a5f38 Merge \"add redirect for \"getting started\" help button in Studio. Also add ?utm_medium=android-studio to all such URLs so we can track the traffic routing in Analytics\" into nyc-dev 
am: 56bacea883

Change-Id: I00dbf309d7e1c79d93733e6c3aa08ec7eca41401
 2016-07-18 19:27:18 +00:00
Scott Main
56bacea883 Merge "add redirect for "getting started" help button in Studio. Also add ?utm_medium=android-studio to all such URLs so we can track the traffic routing in Analytics" into nyc-dev 2016-07-18 19:19:46 +00:00
smain@google.com
91a53a27f5 add redirect for "getting started" help button in Studio. 
Also add ?utm_medium=android-studio to all such URLs so we can track the traffic routing in Analytics

Change-Id: I914d4fac51d3cf7e839a7b5785a7c8cd43b57346
 2016-07-18 12:10:19 -07:00
TreeHugger Robot
699e1bc74b Merge "Fixed bugreport share dialog padding." into nyc-mr1-dev 2016-07-18 18:37:35 +00:00
Dmitry Dementyev
e59fc5fe55 Include correct account id in action_called_account_remove log message. 
Bug: 30013930

Change-Id: I857866e224d8dbc986c3b7e83a5f4e899e09f3ab
 2016-07-18 11:23:20 -07:00
Andrew Solovay
f98e702377 docs: Late-breaking updates to DP5 release notes 
See first comment for doc stage location.

Change-Id: Ib1ea6047d2b8d1ea9ff7e749ae380df65853b7c0
 2016-07-18 11:12:49 -07:00
Christopher Wiley
26bd4efcaa TetherUtil: Use ConnectivityManager for tethering 
In the past, enabling the SoftAP would cause tethering to happen because
of some unfortunate side effects.  This is no longer the case, and
using WifiManager for this purpose is not a good idea.

Bug: 30147602
Test: Can toggle tethering on/off via all of settings, quick settings,
      and quick quick settings.

Change-Id: Iebbfc6c48b3e8e3fa52d235594ded3502f5801a3
 2016-07-18 11:12:00 -07:00
Makoto Onuki
121480cda8 Merge "Implement dumpsys --checkin for shortcut manager" into nyc-mr1-dev 2016-07-18 17:50:25 +00:00
Makoto Onuki
bf6c6b44e1 Merge "Remove the DMAgent whitelisting" into nyc-mr1-dev 2016-07-18 17:50:18 +00:00
Abodunrinwa Toki
63b31d5729 Merge "DO NOT MERGE: FloatingToolbar - Check that app supports RTL." into nyc-mr1-dev 2016-07-18 17:49:26 +00:00
Hall Liu
810ae1ec7b Merge "Add PROPERTY_IS_DOWNGRADED_CONFERENCE" into nyc-mr1-dev 2016-07-18 17:44:40 +00:00
Mark Lu
c4a0139e26 docs: remove trailing white space from jd files 
Change-Id: Id7fb958460bf2f28d88c6120df0395690f32783a
 2016-07-18 10:42:11 -07:00
Android Build Merger (Role)
c024e480ab Merge "Merge \"docs: Added support library 24.1.0\" into nyc-dev am: 872ecfb0bf" into nyc-mr1-dev 2016-07-18 17:29:43 +00:00
Chris Tate
3cec9d44b3 Merge "Document that WallpaperManager.getDrawable() can return null" into nyc-mr1-dev 2016-07-18 17:29:39 +00:00
Andrew Solovay
d341c8a6b2 Merge \"docs: Added support library 24.1.0\" into nyc-dev 
am: 872ecfb0bf

Change-Id: I6ba46b8efcc8567d6192ac274e08ed1489cb0c2e
 2016-07-18 17:29:02 +00:00
Andrew Solovay
872ecfb0bf Merge "docs: Added support library 24.1.0" into nyc-dev 2016-07-18 17:17:01 +00:00
Andrew Solovay
a586325be4 docs: Removed Sony Experia from N Preview download page 
See first comment for doc stage location.

Change-Id: Ib26adafa1ef4d7a104abd1d007ee2f3410bca200
 2016-07-18 10:14:31 -07:00
Mark Lu
5ffdda018e docs: fix typo error in class name 
Fixes the class name in the code sample

Bug: 25072103
Change-Id: I681901502e100b9514f579c46be9ed7a37352426
 2016-07-18 09:50:26 -07:00
Jeff Sharkey
ba0665705b Handle auto-unlocked managed profiles. 
There are cases where a managed profile provides an auth challenge
which is really an automatic unlock as a side effect from the parent
profile being unlocked.  Detect this case and suppress PRE_BOOT
notifications.

Bug: 29931646
Change-Id: I801605b0b59a7924bfe7f433415d9704664a5cbc
 2016-07-18 10:20:23 -06:00
Dirk Dougherty
142c4f7a9f Doc change: updated issues in DP5 release notes. 
am: 73b700404c

Change-Id: Id7bb33217a91f0e37497c83c6e4efbce8743df8b
 2016-07-18 15:21:11 +00:00
Dirk Dougherty
73b700404c Doc change: updated issues in DP5 release notes. 
Change-Id: I8c5af9a9523be71451a23bbac9b34da5079dbc27
 2016-07-18 08:09:24 -07:00
smain@google.com
e8c3590a77 Merge \"update the version number used in docs and update the offline docs landing page\" into nyc-dev 
am: 6623f4177c

Change-Id: I60626863804f787bf5e1435003d730427f1254df
 2016-07-18 15:07:55 +00:00
Android Build Merger (Role)
838542a660 Merge "Merge \"Doc change: updates for DP5 release notes.\" into nyc-dev am: e92ebf666e" into nyc-mr1-dev 2016-07-18 15:03:03 +00:00
Dirk Dougherty
6abda3a4eb Merge \"Doc change: updates for DP5 release notes.\" into nyc-dev 
am: e92ebf666e

Change-Id: I7df3eb17a67a1ddc2019644d1efadacb149dcf48
 2016-07-18 15:02:29 +00:00
TreeHugger Robot
b5239329b1 Merge "Add an isListen method to NetworkRequests." into nyc-mr1-dev 2016-07-18 15:00:21 +00:00
Scott Main
6623f4177c Merge "update the version number used in docs and update the offline docs landing page" into nyc-dev 2016-07-18 14:57:38 +00:00
TreeHugger Robot
ad126d3b8b Merge "Use "real" display size for computing available densities" into nyc-mr1-dev 2016-07-18 14:53:56 +00:00
Dirk Dougherty
e92ebf666e Merge "Doc change: updates for DP5 release notes." into nyc-dev 2016-07-18 14:52:45 +00:00
Ricky Wai
a5111bfda4 Merge "Do not allow to disable package "android"" into nyc-mr1-dev 2016-07-18 14:22:28 +00:00
Ricky Wai
1a7b160ca5 Do not allow to disable package "android" 
Bug: 25337001
Change-Id: I837d70898f00d3c97c8ae1f5eadd0791ba045df6
 2016-07-18 14:29:53 +01:00
Julia Reynolds
5710e91931 Merge \"Check uid for notification policy access.\" into nyc-dev 
am: 8f17d2a48b

Change-Id: Iade2316b64a8d6dc43636fb292c08dbf82c9dc59
 2016-07-18 13:25:54 +00:00
Julia Reynolds
8f17d2a48b Merge "Check uid for notification policy access." into nyc-dev 2016-07-18 13:16:16 +00:00
Lorenzo Colitti
f4a45f4c33 Add an isListen method to NetworkRequests. 
This allows simplification of the ConnectivityService code.

Bug: 23113288
Change-Id: I124544b99c5a920124e9a3d31cda8c6d2abc21fd
 2016-07-18 18:42:26 +09:00
Sungsoo Lim
98287a6d54 DO NOT MERGE: Remove the use of JHEAD in ExifInterface 
Bug: 29270469
Change-Id: I6a6c8aeab2a842ff1646316363d614851625e78f
 2016-07-18 06:32:37 +00:00
Dirk Dougherty
0f1dd617cb Doc change: updates for DP5 release notes. 
Change-Id: I39cca9088d6fc5952a359f42e43a324aad4427f0
 2016-07-17 21:29:53 -07:00
Abodunrinwa Toki
97dd8eee10 DO NOT MERGE: FloatingToolbar - Check that app supports RTL. 
Port I36c0d72984e0abc7c6430cc7d52d8efd7341820e to nyc-mr1-dev.

Bug: 29932935
Change-Id: Icd085508f7d1dd412f4d0805e8fd01734743648e
 2016-07-17 19:25:27 +01:00
Abodunrinwa Toki
3b8e0fdf92 Merge "FloatingActionMode: Fix screen coordinates." into nyc-mr1-dev 2016-07-17 18:07:09 +00:00
Tim Murray
afa67f3d34 Merge "Make sure StrictMode allows disk reads when calling isThreadInProcess." into nyc-mr1-dev 2016-07-16 19:14:30 +00:00
Tim Murray
9bc12a83b6 Make sure StrictMode allows disk reads when calling isThreadInProcess. 
If an application thread disables disk reads on the main thread,
isThreadInProcess will trigger a strict mode violation. This is bad if
the RenderThread is created after disk reads have been disallowed.

bug 30170339

Change-Id: I6918605d11f0c586c156f3168051376c3209b3f1
 2016-07-16 11:48:01 -07:00
Kevin Hufnagle
aef3fd8e46 docs: Added metadata to display AdMob Udacity resource card 
Bug: 27275529
Change-Id: Ia18f984cf042ac8fccfa54aeacfbf5d67568b0f0
 2016-07-15 20:10:52 -07:00
TreeHugger Robot
c3829f528e Merge "Deprecate Resources constructor and updateConfiguration() method" into nyc-mr1-dev 2016-07-16 02:33:55 +00:00
Andreas Gampe
06eb24d95e Frameworks/base: Fix braino missing line 
This got accidentally deleted in cleanup.

Bug: 29223204
Change-Id: I018b44d517f226eca30f141a3397c82a4be19afb
 2016-07-15 18:13:48 -07:00
Adam Lesinski
aa19d5e49e Deprecate Resources constructor and updateConfiguration() method 
These methods were never meant to be public. Instead, developers
can use Context#createConfigurationContext().

Bug:30088019
Bug:29999297
Change-Id: I2b864136163deda0af99fa3bfe9ef4ee1077341a
 2016-07-15 18:01:48 -07:00
Andrew Solovay
8af870a778 Merge \"docs: Updating N Preview \"behavior changes\" doc for DP5\" into nyc-dev 
am: 9d3bc86207

Change-Id: I21af2f098ffd3034b3f88548bfa9210996f7b397
 2016-07-16 00:35:31 +00:00
Jim Miller
29d157bf05 Fix vulnerability in LockSettings service 
Fixes bug 30003944

Change-Id: I8700d4424c6186c8d5e71d2fdede0223ad86904d
 2016-07-15 17:28:53 -07:00
TreeHugger Robot
9d3bc86207 Merge "docs: Updating N Preview "behavior changes" doc for DP5" into nyc-dev 2016-07-16 00:24:49 +00:00