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

196567 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christopher Tate
2fe00adc02 Clean up obsolete pending timeout after restoring package metadata 
Bug 22040047

Change-Id: I460dbcc50a45d794392beb9ff4a4358c05c87e07
 2015-07-07 10:46:10 -07:00
George Mount
20f71891c4 Merge "Fix Fade out during Activity Transition." into mnc-dev 2015-07-06 17:25:46 +00:00
George Mount
a7478ab9a7 Fix Fade out during Activity Transition. 
Bug 22181705

The Fade Transition sets the transitionAlpha in onTransitionEnd.
I previously changed Visibility to only do it in onAnimationEnd,
so the onTransitionEnd overrides the Visibility's version. This
fixes that change.

Change-Id: I7df478897b6fcfec20999965e297925b65a1448b
 2015-07-06 10:23:13 -07:00
Jason Monk
d369d074f5 Merge "Fix wifi crash" into mnc-dev 2015-07-06 17:19:19 +00:00
Makoto Onuki
dfd6301fa2 Merge "If user ejects a storage from details, take user to... ... the storage list view" into mnc-dev 2015-07-06 17:13:29 +00:00
Barnaby James
c1e3ac321f Merge "Minor doc fixes for VoiceInteractor." into mnc-dev 2015-07-06 17:08:15 +00:00
Jason Monk
dbd05a98e5 Fix wifi crash 
Handle clearing state for resume on the same worker thread as everything
else, this way there can't be concurrent modification.

Bug: 22040227
Change-Id: I9ac78a19fc126c8103f3218e657ca93911d3890d
 2015-07-06 13:05:43 -04:00
Amith Yamasani
a72eac60c7 Fix a typo causing NPE in restricted profiles 
Bug: 22287398
Change-Id: Iec19d890c7b0b7ffed3381dc3f5a9b3e761362a7
 2015-07-06 09:24:08 -07:00
Raph Levien
401aa9d807 Merge "Clean up Hyphenator file reading" into mnc-dev 2015-07-06 16:07:37 +00:00
Raph Levien
c3f2f7b93b Clean up Hyphenator file reading 
The old code made invalid assumptions about read() behavior and
failed to clean up properly in case of error. This patch changes the
file reading to use IoUtils.readFileAsString, which handles that.

Bug: 21020457
Change-Id: If9b54955c20a20a4ed5e8381d0c7e9c920d0639a
 2015-07-06 09:01:36 -07:00
Svet Ganov
10c111ed35 Merge "Show basic feature warning for default granted permissions" into mnc-dev 2015-07-06 15:52:01 +00:00
Svet Ganov
cb8d2e2156 Merge "Improve request permission docs" into mnc-dev 2015-07-06 15:48:47 +00:00
George Mount
7fe86c4753 Merge "Fix docs for ViewAnimationUtils.createCircularReveal" into mnc-dev 2015-07-06 14:39:41 +00:00
Geoff Mendal
a559590043 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-07-06 13:58:51 +00:00
Geoff Mendal
b7b84d012b Import translations. DO NOT MERGE 
Change-Id: I16a0ddf1bed80ef9b985cca96eec87e48d342982
Auto-generated-cl: translation import
 2015-07-06 08:56:00 -05:00
Geoff Mendal
210b38d767 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-07-06 13:51:50 +00:00
Geoff Mendal
5d935e8271 Import translations. DO NOT MERGE 
Change-Id: Ia90a9400d718b5ef61f55ed4d6c5eb9fe48d9667
Auto-generated-cl: translation import
 2015-07-06 08:50:33 -05:00
Geoff Mendal
b0819373e0 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-07-06 13:48:36 +00:00
Geoff Mendal
de04da1d9e Import translations. DO NOT MERGE 
Change-Id: I1b900ec1f54720fab0915cede28dd79fbcb70d5c
Auto-generated-cl: translation import
 2015-07-06 08:47:43 -05:00
Geoff Mendal
88b4a0ac56 Import translations. DO NOT MERGE 
Change-Id: Icd52bfb7b30de7dbc2c7c7e7f073a4fddb5fa5e3
Auto-generated-cl: translation import
 2015-07-06 08:43:33 -05:00
Lorenzo Colitti
b0b3d0bcfb Fix two parsing bugs in new DHCP client. 
1. We don't parse PAD options properly, leading in failure to
   parse packets sent by DHCP servers that put the end of options
   marker after pad options and at an odd offset.
2. We get the DhcpResults vendorInfo from the wrong option type
   (60 instead of 43).

Fix these and add unit tests for the offer packets sent by a few
different DHCP servers.

Bug: 21955617
Bug: 22281295
Change-Id: I5d13f1a6a3ff0b53112f18f3db8792fa32ad2da3
 2015-07-06 13:50:53 +09:00
Ian Pedowitz
738a8dfcdc Merge "Fixing log typo. s/realted/related" into mnc-dev 2015-07-05 01:13:44 +00:00
Ian Pedowitz
9139b29ca6 Fixing log typo. s/realted/related 
Bug: 22273408
Change-Id: I756f56ee80d5840bd734249826eb658cbf472921
 2015-07-05 01:12:34 +00:00
Svet Ganov
85be0c4e21 Fix app ops aidl as it is also used from native. 
bug:22248271

Change-Id: Ic3f31d1ee4d27c1483c9d19929c19946d4c815c6
 2015-07-03 16:23:19 -07:00
Svet Ganov
255aece7de Improve request permission docs 
bug:22252258

Change-Id: Ife19eb6b1e17b43a824379d2a039ff1c441bebdd
 2015-07-03 16:04:00 -07:00
Svet Ganov
77ab6a888a Show basic feature warning for default granted permissions 
bug:22174223

Change-Id: Ie8209e1f678ac459893151b5125e86eb5025aad8
 2015-07-03 12:19:02 -07:00
Robin Lee
a7bdb6c99b Merge "KeyChain: annotate with @WorkerThread" into mnc-dev 2015-07-03 16:48:15 +00:00
Lorenzo Colitti
71e3d079d6 Merge "Make the VPN notice connectivity changes on stacked interfaces." into mnc-dev 2015-07-03 02:37:46 +00:00
Svet Ganov
2799767886 Merge "Grant the default gallery app storage permissions" into mnc-dev 2015-07-02 21:37:58 +00:00
Svetoslav
212bd4280d Merge "Make granting default SMS and Phone permissions robust" into mnc-dev 2015-07-02 21:37:33 +00:00
Anthony Lee
930d6b07e3 Merge "Add capability to indicate a conference will never have children." into mnc-dev 2015-07-02 18:33:53 +00:00
Rubin Xu
b1f4cc647f Merge "Remove ExternalMediaFormatActivity" into mnc-dev 2015-07-02 16:22:46 +00:00
Rubin Xu
c85c639312 Remove ExternalMediaFormatActivity 
This activity is no longer used by any part of the framework.

Bug: 9433509
Change-Id: Iace394b7a11b75ed75b2eefc05990626a7e68ac2
 2015-07-02 16:53:57 +01:00
Alex Chau
be6307606e Merge "Clear "profile wiped" notification when a new porfile is created" into mnc-dev 2015-07-02 14:37:04 +00:00
Nicolas Prevot
2ee3beedb1 Merge "In NfcActivityManager, don't use UserHandle.CURRENT." into mnc-dev 2015-07-02 12:28:46 +00:00
Nicolas Prevot
60373e8060 Merge "Fix the case where an intent bounces several times between users." into mnc-dev 2015-07-02 10:27:58 +00:00
Lorenzo Colitti
1b60d11b8f Make the VPN notice connectivity changes on stacked interfaces. 
Currently, the VPN code only looks at base interfaces, so if
464xlat is in use, it will never disconnect when its underlying
network has disconnected. Use getAllInterfaceNames().contains()
instead of just comparing the base interface name.

Bug: 19336810
Change-Id: Id1ba2c80a09cec5098c6f512acdc0a05a939e9f3
 2015-07-02 13:03:03 +09:00
Svet Ganov
200d494b93 Grant the default gallery app storage permissions 
bug:22127986

Change-Id: I1ecd49d57d410bf10734fea4e0c92e6e5028d648
 2015-07-01 20:46:06 -07:00
Svetoslav
a5a0d94023 Make granting default SMS and Phone permissions robust 
The default dialer and sms apps are provided by the telecomm
stak which is brought up asynchronously as a service to which
the system binds. Hence, by the time we grant default permissions
this service is not bound and we do not know the default dialer
(accidentally the default SMS app is available before the service
is up). Now the default permission grant code is robust to handle
both cases of the default sms and phone apps being available
at grant time or asynchronously.

bug:22208642

Change-Id: I6385a0432368731aa9caea046d57eccbfb5abac0
 2015-07-01 20:00:32 -07:00
David Friedman
00f0716a95 am 2ebfc3f7: am fa8eb1e0: Merge "Docs: Localization of Design pages on DAC. Bug: 20503708" into mnc-preview-docs 
* commit '2ebfc3f78483842c789688da47b721f60b4149e4':
  Docs: Localization of Design pages on DAC. Bug: 20503708
 2015-07-02 02:45:30 +00:00
David Friedman
9ee2f2c90f am 5adc6ba0: am 7e4dc922: Merge "Docs: Fixes a terminology error in simplified Chinese on-boarding docs" into mnc-preview-docs 
* commit '5adc6ba056de056f73ee484b859b45657da0c1fb':
  Docs: Fixes a terminology error in simplified Chinese on-boarding docs
 2015-07-02 02:45:24 +00:00
David Friedman
2ebfc3f784 am fa8eb1e0: Merge "Docs: Localization of Design pages on DAC. Bug: 20503708" into mnc-preview-docs 
* commit 'fa8eb1e0d42e7b10447a285d9b2a583d367c3cad':
  Docs: Localization of Design pages on DAC. Bug: 20503708
 2015-07-02 02:33:03 +00:00
David Friedman
5adc6ba056 am 7e4dc922: Merge "Docs: Fixes a terminology error in simplified Chinese on-boarding docs" into mnc-preview-docs 
* commit '7e4dc922d949c7aec0a2a813e9487067e47e4c51':
  Docs: Fixes a terminology error in simplified Chinese on-boarding docs
 2015-07-02 02:32:59 +00:00
Abodunrinwa Toki
8fbe1a0cfc Merge "Add accessibility actions for the PROCESS_TEXT feature." into mnc-dev 2015-07-02 02:29:34 +00:00
David Friedman
fa8eb1e0d4 Merge "Docs: Localization of Design pages on DAC. Bug: 20503708" into mnc-preview-docs 2015-07-02 02:24:14 +00:00
David Friedman
7e4dc922d9 Merge "Docs: Fixes a terminology error in simplified Chinese on-boarding docs" into mnc-preview-docs 2015-07-02 02:23:55 +00:00
David Friedman
de81619dea Docs: Localization of Design pages on DAC. 
Bug: 20503708

Change-Id: Id3a4f5900d99125a1475d939d43444f46555018c
 2015-07-01 19:21:09 -07:00
Wale Ogunwale
b29d573dda am b85962df: am e155eef4: am 2735ac71: am 22cd16a0: am bc4743eb: am 7ab264ab: am 742bfa80: am f3dbb57e: am c215b2b2: am dc9cfca8: Merge "Prevent system uid component from running in an app process" into klp-dev 
* commit 'b85962df1ee6be2bba4c26fbd0964ade2c73a9c9':
  Prevent system uid component from running in an app process
 2015-07-02 02:14:44 +00:00
Wale Ogunwale
b85962df1e am e155eef4: am 2735ac71: am 22cd16a0: am bc4743eb: am 7ab264ab: am 742bfa80: am f3dbb57e: am c215b2b2: am dc9cfca8: Merge "Prevent system uid component from running in an app process" into klp-dev 
* commit 'e155eef4881c1ec8063a62619fe29aa6e8074b71':
  Prevent system uid component from running in an app process
 2015-07-02 01:36:17 +00:00
Wale Ogunwale
e155eef488 am 2735ac71: am 22cd16a0: am bc4743eb: am 7ab264ab: am 742bfa80: am f3dbb57e: am c215b2b2: am dc9cfca8: Merge "Prevent system uid component from running in an app process" into klp-dev 
* commit '2735ac71e6d8d1c00b95104057ac9365abb485d9':
  Prevent system uid component from running in an app process
 2015-07-02 01:22:06 +00:00