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

193906 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yohei Yukawa
168d38aa3c Merge "Convert subtypes whose locale is "tl" to "fil"." into mnc-dev 2015-06-03 17:41:18 +00:00
Alex Klyubin
85f4b7b38c Merge "Fix block mode numbering (CTR got added as 4 rather than 3)" into mnc-dev 2015-06-03 17:25:38 +00:00
Geoff Mendal
4f31c07fdd Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-06-03 17:22:07 +00:00
Geoff Mendal
8c554b015e Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-06-03 17:20:09 +00:00
Geoff Mendal
48b3a1dc1c Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-06-03 17:19:36 +00:00
John Reck
2794a79832 Merge "Fix warning" into mnc-dev 2015-06-03 17:16:47 +00:00
Arunesh Mishra
310fe5af67 Merge "Use config.xml parameters instead of System properties." into mnc-dev 2015-06-03 17:13:55 +00:00
Tyler Gunn
bb6d060585 Merge "API Cleanup: Remove VideoState class." into mnc-dev 2015-06-03 17:13:41 +00:00
Tyler Gunn
87b73f370e API Cleanup: Remove VideoState class. 
- Remove VideoState class.
- Replace references to VideoState constants with VideoProfile equivalent.
- Push VideoState static methods into VideoProfile.

Bug: 21573551
Change-Id: I1bca02772b5b7d86643f612824b07faef7618725
 2015-06-03 10:09:59 -07:00
Nick Kralevich
2d63f0a14a Merge "UsbDeviceManager: Don't unnecessarily touch properties" into mnc-dev 2015-06-03 16:59:49 +00:00
Geoff Mendal
77100c2094 Import translations. DO NOT MERGE 
Change-Id: I885d3ce3321af31b87a4817037557914d9679a4e
Auto-generated-cl: translation import
 2015-06-03 11:58:05 -05:00
Doris Liu
8085da8d4c Merge "Fix calls to Rect.intersect(Rect)" into mnc-dev 2015-06-03 16:57:46 +00:00
Abodunrinwa Toki
87e949c4b8 Merge "More FloatingToolbar styles." into mnc-dev 2015-06-03 16:54:38 +00:00
John Reck
2a8bb05a31 Fix warning 
Bug: 21608208
Change-Id: I1d1cf1fbc8c0a4561bf76e307c56be580fb4baef
 2015-06-03 09:53:42 -07:00
Geoff Mendal
f806744fce Import translations. DO NOT MERGE 
Change-Id: I7855e24fc4715b1bf7cf978dd40b3bd66f242427
Auto-generated-cl: translation import
 2015-06-03 11:51:22 -05:00
Geoff Mendal
ff1fc4c75b Import translations. DO NOT MERGE 
Change-Id: I8cb4cb369c064d934e671d9ae8086f9d079d79f3
Auto-generated-cl: translation import
 2015-06-03 11:47:54 -05:00
Alex Klyubin
4699e43dc6 Fix block mode numbering (CTR got added as 4 rather than 3) 
Change-Id: I8c886c67ba081255ef18eb0f99ca1e6003fabb33
 2015-06-03 09:36:51 -07:00
Alex Klyubin
5c56f74527 Merge "Remove KM_TAG_CHUNK_LENGTH and add KM_TAG_AEAD_TAG" into mnc-dev 2015-06-03 16:35:21 +00:00
Xiaohui Chen
4913211dbe Merge "usb debugging: show alert to secondary user" into mnc-dev 2015-06-03 16:35:09 +00:00
Xiaohui Chen
ffcfe3411f usb debugging: show alert to secondary user 
Bug: 12785423
Change-Id: If7f60899cfdaca7bdad560bd59a78f5be74c24be
 2015-06-03 09:32:19 -07:00
Yorke Lee
ac2e3886e3 Merge "Allow default dialer changes and phone account enable/disable via ADB" into mnc-dev 2015-06-03 16:24:17 +00:00
John Spurlock
ad94045eb2 Merge "Zen: Mute alarm (vibrations) in total silence." into mnc-dev 2015-06-03 16:23:33 +00:00
John Spurlock
25d01ee515 Zen: Mute alarm (vibrations) in total silence. 
Bug: 21376328
Change-Id: I00b46e64a0ec8d9b5066b5a9be10fc859dca0126
 2015-06-03 12:18:32 -04:00
John Spurlock
b9f2b4ec11 Merge "Volume: Ripple tweaking on zen mode condition rows." into mnc-dev 2015-06-03 16:01:00 +00:00
John Spurlock
9ec8f0607e Volume: Ripple tweaking on zen mode condition rows. 
Bug: 21335622
Change-Id: Ifcd7e5a3c14625e0442dcdb23b9b27a01545953c
 2015-06-03 11:56:08 -04:00
John Spurlock
dfe8044160 Merge "Audio policy: setting explicit non-zero volume unmutes the stream." into mnc-dev 2015-06-03 15:17:55 +00:00
Paul Jensen
736432edd2 Merge "Disallow going back to initial empty page in captive portal app" into mnc-dev 2015-06-03 15:17:11 +00:00
Paul Jensen
e836b6847a Disallow going back to initial empty page in captive portal app 
This is a little tricky because WebView history can only be cleared
after the next page load and we don't want to allow hitting back
during the first page load.

Bug:21147832
Change-Id: I639dfd27d4dc3af618282256ca02b9947e64a7b9
 2015-06-03 15:15:12 +00:00
John Spurlock
75ae23c096 Audio policy: setting explicit non-zero volume unmutes the stream. 
And vice versa.

Bug: 21584884
Change-Id: I2cd6a84ab40edba4c6fc2b219693e0d4f0527d8d
 2015-06-03 10:50:52 -04:00
John Spurlock
e7f68c18bf Merge "Volume footer uglification." into mnc-dev 2015-06-03 13:24:44 +00:00
Paul Jensen
e247cdec6d Merge "Update captive portal sign-in app SSL error page UI." into mnc-dev 2015-06-03 13:17:58 +00:00
Paul Jensen
65636fb23c Update captive portal sign-in app SSL error page UI. 
Add text and update image as per UX team recommendations.
Add "Use as is and open browser" link.

Bug:18791346
Bug:20038019
Bug:20486308
Change-Id: Ibf6d1493f5332e7905154cc7306645ac4c1a6283
 2015-06-03 09:12:25 -04:00
Erik Kline
6a5c0e10b1 Delete unsed mDnsLock. 
Bug: 21449922
Change-Id: I0c9f95c30eaa170d809e86f6505379f34a0a7603
 2015-06-03 16:10:08 +09:00
Yoshiki Iguchi
0d8513adca Merge "Add a permission annotation to IMM#setCurrentInputMethodSubtype." into mnc-dev 2015-06-03 06:05:37 +00:00
Lorenzo Colitti
0326f7772c Merge changes I9b96cdcf,Ib4b29a7f into mnc-dev 
* changes:
  Remove the IPv4 address from the interface when DHCP fails.
  Make the dumpsys connectivity shorter and easier to read.
 2015-06-03 06:03:44 +00:00
Shawn Willden
56396c7f5b Merge "Track changes to the keystore binder API" into mnc-dev 2015-06-03 05:22:02 +00:00
Jan Nordqvist
d492883529 Cleaned out "isValid" from WifiConfig. 
Change-Id: I028615e55700aa92889670297f1130397eba650f
(cherry picked from commit c50315e014efded84b8f1981602951011816360b)
 2015-06-03 05:18:12 +00:00
Soonil Nagarkar
597492c963 Add NO_BATCH flag to WifiScanner 
Change-Id: Idd521f724684986ff84306327d42b810f7b30245
(cherry picked from commit b9e6d98c6c0a05ebfc73a14d1ac2a47d58290241)
 2015-06-03 05:17:57 +00:00
Vinit Deshpande
f0742bdf06 Merge changes from topic 'mwd-merge-wifi-0602015' into mnc-dev 
* changes:
  keep hal based pno disabled by default
  fix annoying typo
  enable SSID whitelist
  Rename HandlerThread name in RttManager     The sHandlerThread name in RttManager is called "WifiScanner".     It should be changed to RTTManager
 2015-06-03 05:09:32 +00:00
Seigo Nonaka
2752a14939 Merge "Use final in favor of initialization safety." into mnc-dev 2015-06-03 04:58:40 +00:00
Seigo Nonaka
92adda2b61 Use final in favor of initialization safety. 
Making a member field final would be beneficial not
only for the readability but also for the initialization
safety.
Leaving SpellCheckerSession#mSpellCheckerSessionListener
non-final does not make sense not only because we never
change that member field once SpellCheckerSession object
is created and but also because SpellCheckerSession
instance is designed to be accessed from multiple threads
at the same time, no matter if it has something to do
with Bug 18945456 or not.

Change-Id: I1a7ebb54a5d0beddee8799fc5b0800c6e1059099
 2015-06-03 04:53:44 +00:00
Casper Bonde
2328423d19 Add support for MITM for BluetoothSockets (1/4) 
This change adds an option to enforce Man-in-the-middle protection
for the authentication process. This feature is needed for the Sim
Access Profile.

Change-Id: Ia3ef0caeb750f88608c9fa6bf6367d1c77de4cf3
Signed-off-by: Casper Bonde <c.bonde@samsung.com>
 2015-06-03 03:44:40 +00:00
Lorenzo Colitti
48f9c731ff Remove the IPv4 address from the interface when DHCP fails. 
Bug: 19704592
Change-Id: I9b96cdcfc7c9442b3f8d6797aca63559ed4bdb9b
 2015-06-03 12:09:14 +09:00
Lorenzo Colitti
e380546aed Make the dumpsys connectivity shorter and easier to read. 
- Print NetworkFactories on one line.
- Only print LegacyTypeTracker networks if they are connected,
  and record supported network types on a separate summary line.
- Print all tethering upstreams on one line.
- Summarize the state of the transition wakelock on one line.
- Don't print Inet condition reports if there are none.
  (Currently there can never be any.)

Bug: 21449922
Change-Id: Ib4b29a7fd882e6c105839a255fffecf4f346cf7e
 2015-06-03 11:29:41 +09:00
Erik Kline
b12c97040b Merge "Send neighbors into NUD_PROBE rather than NUD_DELAY" into mnc-dev 2015-06-03 01:59:49 +00:00
Adrian Roos
21d2a25763 Prevent panel and QS expansion before device is decrypted 
Bug: 21514179
Change-Id: Ia36409a2645a00fc2c2630eb39c05d3a0599fd8a
 2015-06-03 01:08:21 +00:00
Svetoslav
f559546d8c Merge "Add annotations to a new API" into mnc-dev 2015-06-03 01:01:41 +00:00
Andres Morales
8f589d01d1 Merge "[LockSettings] migrate patterns to be indexed at '1'" into mnc-dev 2015-06-03 01:01:18 +00:00
Svetoslav
9ce9a15f62 Add annotations to a new API 
Change-Id: I41a87a0ba81b1123e06096db510a02a1d9e6531d
 2015-06-02 17:59:31 -07:00
Jun Mukai
3c1348773a Merge "Retire PFLAG_ONLY_DRAWS_BACKGROUND." into mnc-dev 2015-06-03 00:59:15 +00:00