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

212888 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
57b7fa49ac Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2015-11-05 19:49:23 +00:00
Baligh Uddin
6be193d87e Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2015-11-05 19:49:19 +00:00
Baligh Uddin
8019f49d08 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2015-11-05 19:49:17 +00:00
Dan Albert
c74dd7fcb1 Merge branch 'stage-aosp-master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into stage-aosp-master 2015-11-05 19:41:33 +00:00
Dan Albert
3061d67f86 Merge "Use std::unique_ptr instead of UniquePtr." 
am: 22b7e496c2

* commit '22b7e496c23c76b1f6d94e3ce99f39f9d3bca973':
  Use std::unique_ptr instead of UniquePtr.
 2015-11-05 19:40:59 +00:00
Baligh Uddin
37a728001d Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2015-11-05 19:40:41 +00:00
Baligh Uddin
ed472fba42 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2015-11-05 19:40:25 +00:00
Baligh Uddin
e1348a7fa9 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2015-11-05 19:40:15 +00:00
Baligh Uddin
2523c61fb7 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2015-11-05 19:40:04 +00:00
Baligh Uddin
cfd3d76b91 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2015-11-05 19:39:20 +00:00
Baligh Uddin
c138df954f Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2015-11-05 19:39:16 +00:00
Baligh Uddin
aa4dbe2d84 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2015-11-05 19:39:12 +00:00
Dan Albert
22b7e496c2 Merge "Use std::unique_ptr instead of UniquePtr." 2015-11-05 19:32:43 +00:00
Baligh Uddin
70df552ac2 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2015-11-05 19:32:07 +00:00
Baligh Uddin
31f0d18a03 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2015-11-05 19:32:05 +00:00
Chad Brubaker
0bafbbfcb4 Merge "Add initial network security config implementation" 
am: 8c35820720

* commit '8c358207206c5e19541c65e3f9761d1adb54550b':
  Add initial network security config implementation
 2015-11-05 18:52:46 +00:00
Chad Brubaker
8c35820720 Merge "Add initial network security config implementation" 2015-11-05 18:46:24 +00:00
Brian Carlstrom
671d5965f7 Merge "Fixes for sm and pm usage" 
am: ffb15da518

* commit 'ffb15da518e35727e218bfba48927902d4368e2f':
  Fixes for sm and pm usage
 2015-11-05 18:42:53 +00:00
Brian Carlstrom
ffb15da518 Merge "Fixes for sm and pm usage" 2015-11-05 18:38:56 +00:00
Brian Carlstrom
82bfca4609 Fixes for sm and pm usage 
sm showed IllegalArgumentException after usage.
pm inconsistently used "return showUsage()"

Bug: 20948199
Change-Id: I5828489a9d4ef2eabfb97dd408d66e1560a5a983
 2015-11-05 10:33:40 -08:00
Dan Albert
a41288b88f Merge "Don\'t apply clang flag to gcc builds." 
am: d9a1b35df6

* commit 'd9a1b35df62eddc56f69281aea1534d187b63205':
  Don't apply clang flag to gcc builds.
 2015-11-05 18:22:57 +00:00
Dan Albert
d9a1b35df6 Merge "Don't apply clang flag to gcc builds." 2015-11-05 18:18:45 +00:00
Dan Albert
0eadf57cad Don't apply clang flag to gcc builds. 
For whatever reason GCC doesn't fail the build on unknown flags unless
there is also a warning emitted. Since we're now deprecating
UniquePtr, the warning is thrown here and the build fails (despite not
being -Werror).

Bug: http://b/22403888
Change-Id: I4af7911a51f7af9aa47a596a76f3e9d79535585b
 2015-11-05 00:59:09 -08:00
Dan Albert
b0624da118 Use std::unique_ptr instead of UniquePtr. 
We're deprecating UniquePtr, so we need to move to the real thing.

Bug: http://b/22403888
Change-Id: I5b7fdf4924dd8c12a8c7dba89278714ca6fdc60a
 2015-11-05 00:57:12 -08:00
Svetoslav Ganov
0c7e9262a1 Merge "Take into account default app for default grants" 
am: 82eeb2f20c

* commit '82eeb2f20c934ddc97380032b3c8ecacc21d9a04':
  Take into account default app for default grants
 2015-11-05 02:25:32 +00:00
Svetoslav Ganov
a9b62e1330 Merge "Enforce weaker grant if app is default handler for miltiple action" 
am: 035374d7a2

* commit '035374d7a29b4e0b0bc71bdfb3555b2e547ce1da':
  Enforce weaker grant if app is default handler for miltiple action
 2015-11-05 02:23:44 +00:00
Svetoslav Ganov
82eeb2f20c Merge "Take into account default app for default grants" 2015-11-05 02:19:12 +00:00
Svetoslav Ganov
035374d7a2 Merge "Enforce weaker grant if app is default handler for miltiple action" 2015-11-05 02:19:00 +00:00
Svetoslav
5db602fd19 Enforce weaker grant if app is default handler for miltiple action 
Change-Id: Ibc46e458e277412ebb276eb5ba6f2765b6b6c5e9
 2015-11-05 02:18:13 +00:00
Baligh Uddin
c94647cfb3 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 25433205
Change-Id: I20cf8ac4a5039ead0a65bd2e38ded78542a7a3e8
 2015-11-04 15:59:57 -08:00
Baligh Uddin
599c81d0ea Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 25433205
Change-Id: I924e59eeff537a0f66ae7ac7ace1dacd1f89f35e
 2015-11-04 15:57:40 -08:00
Baligh Uddin
40fa6b1e91 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 25433205
Change-Id: I44df802e45a340d7ef7f094c6c06001d350bb0c5
 2015-11-04 15:46:28 -08:00
Baligh Uddin
e22fb216ee Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 25433205
Change-Id: I76a9ab65d1fe10e2915e5cd794a5cbce1697a933
 2015-11-04 15:36:55 -08:00
Baligh Uddin
a1065cf5d9 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 25433205
Change-Id: I924dde8b982ce94128882b484e9c3e9dc5c49013
 2015-11-04 15:34:55 -08:00
Baligh Uddin
8ff8892c12 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 25433205
Change-Id: I76cc8d18dd82f9af09310685a88843eeb71a991c
 2015-11-04 15:32:37 -08:00
Baligh Uddin
7ca7920f8d Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 25433205
Change-Id: Iec5d9e5b20c530e3056e2410af42fd8af8c16788
 2015-11-04 15:30:29 -08:00
Baligh Uddin
87428865b2 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 25433205
Change-Id: I790f09439e904a82ed90ec07f6bbdab1e8ef42d8
 2015-11-04 15:28:25 -08:00
Baligh Uddin
5bc5bb57f3 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 25433205
Change-Id: I87a141d9b4b2ac688432d52e1bbe15626b1f301b
 2015-11-04 15:26:15 -08:00
Baligh Uddin
29aa638aec Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 25433205
Change-Id: I31e759c6b0da2ecb71418aa3033f832a9ee42250
 2015-11-04 15:24:05 -08:00
Chad Brubaker
6bc1e3966c Add initial network security config implementation 
Initial implementation of a unified application wide static
network security configuration.

This currently encompases:
* Trust decisions such as what trust anchors to use as well as static
  certificate pinning.
* Policy on what to do with cleartext traffic.

In order to prevent issues due to interplay of various components in an
application and their potentially different security requirements
configuration can be specified at a per-domain granularity in addition
to application wide defaults.

This change contains the internal data structures and trust management
code, hooking these up in application startup will come in a future
commit.

Change-Id: I53ce5ba510a4221d58839e61713262a8f4c6699c
 2015-11-04 14:31:18 -08:00
Baligh Uddin
185269d3e9 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 25433205
Change-Id: I3ae0e8f44a5933c708d072f2053dbde77795e411
 2015-11-04 11:56:04 -08:00
Baligh Uddin
3a68edba5c Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 25433205
Change-Id: I46efa0b9d7293d80c68cb6a1e21dfaa509c6d7d2
 2015-11-04 11:51:55 -08:00
Glenn Kasten
1104180301 Merge "Built-in mic is not used when USB mic is disconnected" 
am: ebbdabdb82

* commit 'ebbdabdb826c083769e7d7bc102a59a04c9e0329':
  Built-in mic is not used when USB mic is disconnected
 2015-11-04 16:10:44 +00:00
Glenn Kasten
ebbdabdb82 Merge "Built-in mic is not used when USB mic is disconnected" 2015-11-04 16:03:41 +00:00
Alejandro Ochoa
46b434ff98 Built-in mic is not used when USB mic is disconnected 
In some cases when the USB microphone is disconnected,
audio stack does not switch to the built-in microphone.
It gets stuck in a state where it still recognizes the
USB mic is still connected. Current device removal
implementation only considers USB output devices such
as headset. The same process should be used for input
USB devices (microphone).

Bug: 24932354
Change-Id: Ic2089ef5a9a318cb47336ade405f79eccd7129f8
Signed-off-by: Alejandro Ochoa <alejandro.ochoa@intel.com>
 2015-11-04 15:58:09 +00:00
Bill Yi
2e8c3c11b7 Merge commit 'bce5116b8d10c91436445cd0a0830bb51702bfd4' into HEAD 2015-11-03 14:29:59 -08:00
Wale Ogunwale
d89b76a58d Merge "[ActivityManager] Fix NullPointerException in startNextMatchingActivity." 
am: 7810aed854

* commit '7810aed85408bddc4cc0c65e5be8d082c638d995':
  [ActivityManager] Fix NullPointerException in startNextMatchingActivity.
 2015-11-03 15:13:24 +00:00
Wale Ogunwale
7810aed854 Merge "[ActivityManager] Fix NullPointerException in startNextMatchingActivity." 2015-11-03 15:09:32 +00:00
joanne_chung
a084fb7b93 [ActivityManager] Fix NullPointerException in startNextMatchingActivity. 
Symptom:
NullPointerException crash while call startNextMatchingActivity.

Root Cause:
Activity starts with FLAG_DEBUG_LOG_RESOLUTION for debug dump.
If the current Activity is the last object of resolves list,
  we can not get the next Activity and aInfo is still null.

Solution:
Check null in debug log dump.

Change-Id: I4c5d14d9acd8d47768b36c95354763841579e050
 2015-11-03 11:36:41 +08:00
Svetoslav
fce33d58d8 Take into account default app for default grants 
Use the correct API to query activities when granting
default permissions to ensure the preferred apps are
taken into account. This allows OEMs to customize which
app should get default permission grants if there is
more than one resolving to the query intent.

Change-Id: I047f22dfff773a2ba9de1a0144442e372607777c
 2015-11-02 16:41:57 -08:00