Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
312,274 Commits 3 Branches 0 Tags
7a776f03a1279eeea82ded4e652c8869e6ef1f8c
Commit Graph

312274 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pavlin Radoslavov
7a776f03a1 Merge "Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()" into oc-dev 
am: 4e7bc119ae

Change-Id: I8bf6233fe843a13b0e49e6abc5bd490159442185
 2017-03-30 01:22:32 +00:00
TreeHugger Robot
4e7bc119ae Merge "Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()" into oc-dev 2017-03-30 01:17:23 +00:00
Evan Rosky
f99eb172ae Merge "Expose initial focus feature flag for testing" into oc-dev 
am: 7ac3fb2282

Change-Id: I615222fa4f1ee33c977daf771a15495e7771d2ca
 2017-03-30 01:10:25 +00:00
Evan Rosky
7ac3fb2282 Merge "Expose initial focus feature flag for testing" into oc-dev 2017-03-30 01:02:28 +00:00
Abhijith Shastry
c8d771593a Merge "Update injectSmsPdu documentation." into oc-dev 
am: 13dbbaf50a

Change-Id: I6174713b7b9a2b51bca56ffe680a00d0591a35dd
 2017-03-30 00:40:30 +00:00
Adam Lesinski
719349cdb3 Merge "AAPT2: Parse an ID encoded as a map" into oc-dev 
am: c26ace0754

Change-Id: I5e2aba17860b27cd5f27d4b73c65775a74630881
 2017-03-30 00:36:24 +00:00
TreeHugger Robot
13dbbaf50a Merge "Update injectSmsPdu documentation." into oc-dev 2017-03-30 00:36:01 +00:00
Adam Lesinski
78b5fad19e Merge "AAPT2: Allow arbitrary entry names with aapt2 optimize" into oc-dev 
am: 86cb762ae6

Change-Id: Id175edab5f98cb062731c7d4064006f56f991a6d
 2017-03-30 00:35:29 +00:00
Adam Lesinski
c26ace0754 Merge "AAPT2: Parse an ID encoded as a map" into oc-dev 2017-03-30 00:31:01 +00:00
Adam Lesinski
86cb762ae6 Merge "AAPT2: Allow arbitrary entry names with aapt2 optimize" into oc-dev 2017-03-30 00:30:30 +00:00
Evan Rosky
85aa3e82c7 Merge "Allow cluster navigation to jump into touchscreenBlocksFocus" into oc-dev 
am: 37af93ad1c

Change-Id: I92254792b7681d1be53849ad3847dbb4e5318139
 2017-03-30 00:29:48 +00:00
Evan Rosky
37af93ad1c Merge "Allow cluster navigation to jump into touchscreenBlocksFocus" into oc-dev 2017-03-30 00:22:40 +00:00
Michael Plass
70b93740c2 Merge "Remove implementation of bssid hotlist" am: 62c5f64fa5 am: 37a1d983fe 
am: 7b4d1bbacc

Change-Id: I1cc13641f08367784c772a08ec5aeffba08ea207
 2017-03-30 00:14:00 +00:00
Nathan Harold
560c9ec724 Merge commit 'e45e328821ba' into oc-dev-plus-aosp 
Change-Id: I30ad9038be8faee57e5d6b1391d9e70a966a9a77
 2017-03-29 17:05:10 -07:00
Michael Plass
7b4d1bbacc Merge "Remove implementation of bssid hotlist" am: 62c5f64fa5 
am: 37a1d983fe

Change-Id: I546410e5a0efbbdddee526cd494ba33a6eb1005b
 2017-03-30 00:02:58 +00:00
Robert Greenwalt
fb0ad3705d Merge "Correct ACTION_SHOW_NOTICE_ECM_BLOCK_OTHERS" into oc-dev 
am: 8931dc5d2f

Change-Id: I1866dd1f0f44dd6653c1d8c9618f04386a172888
 2017-03-30 00:00:08 +00:00
Michael Plass
37a1d983fe Merge "Remove implementation of bssid hotlist" 
am: 62c5f64fa5

Change-Id: I3744706b984da6ed123a4eea08312c75806adb8f
 2017-03-29 23:57:32 +00:00
Nathan Harold
e45e328821 Merge commit 'ce073d70bedc' into stage-aosp-master 
am: 4fdc7d5ddd

Change-Id: I4bde8eedc986900096fc8429da2b195f907605c9
 2017-03-29 23:56:06 +00:00
Robert Greenwalt
8931dc5d2f Merge "Correct ACTION_SHOW_NOTICE_ECM_BLOCK_OTHERS" into oc-dev 2017-03-29 23:53:22 +00:00
Treehugger Robot
62c5f64fa5 Merge "Remove implementation of bssid hotlist" 2017-03-29 23:50:03 +00:00
Chad Brubaker
ba18f8674e Merge "Expose ACCESSIBILITY_CAPTIONING_* to Instant Apps" into oc-dev 
am: 84eecd2532

Change-Id: Ib297fcfe2f6bff079a4325420bc8b62a5f29bd55
 2017-03-29 23:33:48 +00:00
Makoto Onuki
d76076a103 Merge "Mention <intent> can't have string resources." into oc-dev 
am: 6c3e92bbe9

Change-Id: I7f4a77fd3dd98955ad4f6e88b6471d72190a3977
 2017-03-29 23:32:54 +00:00
TreeHugger Robot
84eecd2532 Merge "Expose ACCESSIBILITY_CAPTIONING_* to Instant Apps" into oc-dev 2017-03-29 23:25:57 +00:00
TreeHugger Robot
6c3e92bbe9 Merge "Mention <intent> can't have string resources." into oc-dev 2017-03-29 23:24:42 +00:00
Tony Mak
742d336461 Merge "Whitelist ManagedProvisioning from bg check" into oc-dev 
am: fc1dd04b0b

Change-Id: I69b3c9fed0cc52b7a500f05a2ca8cd9fe3d0cc36
 2017-03-29 23:21:23 +00:00
TreeHugger Robot
fc1dd04b0b Merge "Whitelist ManagedProvisioning from bg check" into oc-dev 2017-03-29 23:12:43 +00:00
Nathan Harold
4fdc7d5ddd Merge commit 'ce073d70bedc' into stage-aosp-master 
Change-Id: I319034a5b77de5cf71de0e110bb17819fb907f1b
 2017-03-29 16:04:31 -07:00
Android Build Merger (Role)
7035d9a920 Merge "Merge "Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()" am: 3c7fce3579 am: 25105f6561 am: dfc1264eff" into oc-dev-plus-aosp 2017-03-29 22:59:12 +00:00
Pavlin Radoslavov
011597b5a9 Add new internal API: enableOptionalCodecs()/disableOptionalCodecs() 
This API can be used to enable the optional codecs, or disable them
and use only the mandatory SBC.
Internally, it is implemented by raising the SBC priority to
highest (so SBC will be used/selected), or reducing the SBC priority
to its default value (lowest).

Test: A2DP streaming and enabling/disabling/selecting optional codecs
Bug: 35873828
Change-Id: Ia82036ac33590a3a402b1f5a36102264d47a9029
(cherry picked from commit 61075105ca)
 2017-03-29 15:58:25 -07:00
Pavlin Radoslavov
3713929862 Merge "Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()" am: 3c7fce3579 am: 25105f6561 
am: dfc1264eff

Change-Id: I09fd2e135ff0410b08ce197f98a4f58b14c9b7c6
 2017-03-29 22:57:22 +00:00
Jason Monk
cedc7dfc2e Merge "Fix battery warning color lookup" into oc-dev 
am: 834c260e98

Change-Id: Ic29ab89382f4d44e0777d3440ebbe7581a367220
 2017-03-29 22:56:24 +00:00
Peter Qiu
a5b0d84ea7 Merge "wifi: add test for tracking Passpoint AP on devices with Passpoint disabled" into oc-dev 
am: f1cc8b82b3

Change-Id: Id1e32596121a5aef347d6e9bc4c2402a22acc207
 2017-03-29 22:55:31 +00:00
Pavlin Radoslavov
dfc1264eff Merge "Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()" am: 3c7fce3579 
am: 25105f6561

Change-Id: I67601df54e55171e3d559b71258d99ad1e0a8c5d
 2017-03-29 22:51:41 +00:00
Treehugger Robot
ce073d70be Merge "Add a Skeleton IpSecService" 2017-03-29 22:50:50 +00:00
TreeHugger Robot
834c260e98 Merge "Fix battery warning color lookup" into oc-dev 2017-03-29 22:50:31 +00:00
TreeHugger Robot
f1cc8b82b3 Merge "wifi: add test for tracking Passpoint AP on devices with Passpoint disabled" into oc-dev 2017-03-29 22:50:03 +00:00
Pavlin Radoslavov
25105f6561 Merge "Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()" 
am: 3c7fce3579

Change-Id: Ic8483107e72a61e8b07f26f343e36254fe57cfd9
 2017-03-29 22:47:28 +00:00
Treehugger Robot
3c7fce3579 Merge "Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()" 2017-03-29 22:41:15 +00:00
Yifan Hong
fb3066af0a Merge "Add HidlSupport.java for utility methods for HIDL." into oc-dev 
am: ee40a2652c

Change-Id: I565135074b206a3ae6f1783f4de799b57593e7c6
 2017-03-29 22:24:52 +00:00
TreeHugger Robot
ee40a2652c Merge "Add HidlSupport.java for utility methods for HIDL." into oc-dev 2017-03-29 22:20:33 +00:00
Evan Rosky
18b886e8b2 Allow cluster navigation to jump into touchscreenBlocksFocus 
Adds an exception to touchscreenBlocksFocus ViewGroups which
are also keyboardNavigationClusters. The behavior we want is
that cluster navigation can jump into touchscreenBlocksFocus
clusters but normal keyboard navigation can't. Once focus is
in a touchscreenBlocksFocus cluster; however, we allow focus
navigation to move freely within that cluster. It remains in
that cluster until a subsequent cluster navigation brings it
back out.

Adds back the touchscreenBlocksFocus attributes to Toolbar
and actionbar so that they behave like they did before.

Bug: 34363323
Test: Added CTS test. Verified desired behavior in a test app

Change-Id: I555bf5570b16a57f0d4c8a020ae509a1e1b33910
(cherry picked from commit aee802f3bc)
 2017-03-29 22:18:56 +00:00
Evan Rosky
01f46a29ce Expose initial focus feature flag for testing 
Bug: 34520588
Test: View_FocusHandlingTest
Change-Id: I7a20a6e9c57fc61bd2562307f4e7f8dee1979a40
(cherry picked from commit 9a0ea38671)
 2017-03-29 22:11:34 +00:00
Phil Weaver
d859a67fa9 Merge "Move displaying mag bounds into surface transation" into oc-dev 
am: 6f3bc05868

Change-Id: I1240a4c21d712d1c04793897c5c50ef93edfc618
 2017-03-29 21:32:19 +00:00
TreeHugger Robot
6f3bc05868 Merge "Move displaying mag bounds into surface transation" into oc-dev 2017-03-29 21:25:06 +00:00
Michael Plass
31225c466e Remove implementation of bssid hotlist 
Test: Relevant unit tests pass
Bug: 30147676
Change-Id: I268907cc13ef21c0ba547722fe7c866ee4cdae5a
 2017-03-29 14:19:50 -07:00
Makoto Onuki
03169cddf6 Mention <intent> can't have string resources. 
Test: build
Bug 34046756

Change-Id: I761b246d6aba5df4a836af3d0b3bef8f977be5ec
 2017-03-29 21:07:15 +00:00
Jaekyun Seok
bfc81099f9 Merge "Enable static RROs by default" into oc-dev 
am: 22ea35187f

Change-Id: I0a00621eb8cb54bd89c938539d8a2d7baee46833
 2017-03-29 20:58:12 +00:00
Adam Lesinski
b1afa07745 AAPT2: Allow arbitrary entry names with aapt2 optimize 
Presumably, the apps build fine for the developers, so just
feed the existing names through without validation. Validation
still exists when building an app from source.

Bug: 36051854
Change-Id: Idc64ee91b08dce67d3c28f3c5284a7afa1312df1
Test: run aapt2 optimize on the apks from b/36051854 and build aapt2_tests
 2017-03-29 20:56:32 +00:00
TreeHugger Robot
22ea35187f Merge "Enable static RROs by default" into oc-dev 2017-03-29 20:48:57 +00:00
Tony Mak
bbb551cfb5 Whitelist ManagedProvisioning from bg check 
Notice that app put in this list is also exempted from doze.
Also, this only exempts us from the service restriction, but not the broadcast one.

Test: adb shell am make-uid-idle  --user 0 com.android.managedprovisioning
      && adb shell am broadcast -a android.intent.action.PRE_BOOT_COMPLETED -n com.android.managedprovisioning/com.android.managedprovisioning.ota.PreBootListener
      Observe there is no crash

Change-Id: Ic0a943a9b66c909a6727f9411af519a8c6cf0157
Fix: 36705375
 2017-03-29 20:41:17 +00:00