Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
196,582 Commits 3 Branches 0 Tags
b17fdaec83bf1def8efe321aa285ece8b99cebe3
Commit Graph

196582 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Spurlock
b17fdaec83 am cc681b81: am e7f68c18: Merge "Volume footer uglification." into mnc-dev 
* commit 'cc681b819b18c767488d7cf82cc4f50f79cbd9e6':
  Volume footer uglification.
 2015-06-03 17:46:42 +00:00
Paul Jensen
5ea195d525 am 002f8c6c: am e247cdec: Merge "Update captive portal sign-in app SSL error page UI." into mnc-dev 
* commit '002f8c6cbc057426da17ff9d560c756e5d652ae2':
  Update captive portal sign-in app SSL error page UI.
 2015-06-03 17:46:38 +00:00
Erik Kline
e0002169bd am 6ac63c7d: am 6a5c0e10: Delete unsed mDnsLock. 
* commit '6ac63c7d7ba1bc0177d22650e6e2f7d8e412daa2':
  Delete unsed mDnsLock.
 2015-06-03 17:46:23 +00:00
Yoshiki Iguchi
c4c59bc894 am 54da4c98: am 0d8513ad: Merge "Add a permission annotation to IMM#setCurrentInputMethodSubtype." into mnc-dev 
* commit '54da4c981b11211f39682511749bcb24f0a397fe':
  Add a permission annotation to IMM#setCurrentInputMethodSubtype.
 2015-06-03 17:46:16 +00:00
Lorenzo Colitti
e3a9645108 am d315f373: am 0326f777: Merge changes I9b96cdcf,Ib4b29a7f into mnc-dev 
* commit 'd315f373d8b7359b7966f680a4fa8924b569975c':
  Remove the IPv4 address from the interface when DHCP fails.
  Make the dumpsys connectivity shorter and easier to read.
 2015-06-03 17:46:10 +00:00
Shawn Willden
68f17203b2 am b183fdca: am 56396c7f: Merge "Track changes to the keystore binder API" into mnc-dev 
* commit 'b183fdca615e847ed03389905b0a30e30d9d37c5':
  Track changes to the keystore binder API
 2015-06-03 17:45:45 +00:00
John Spurlock
cc681b819b am e7f68c18: Merge "Volume footer uglification." into mnc-dev 
* commit 'e7f68c18bf1a1da5d0aa129674fe4f9ecf06ac8c':
  Volume footer uglification.
 2015-06-03 13:29:41 +00:00
Paul Jensen
002f8c6cbc am e247cdec: Merge "Update captive portal sign-in app SSL error page UI." into mnc-dev 
* commit 'e247cdec6db549035b67bb21fa08a4c6c73897d3':
  Update captive portal sign-in app SSL error page UI.
 2015-06-03 13:29:37 +00: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
6ac63c7d7b am 6a5c0e10: Delete unsed mDnsLock. 
* commit '6a5c0e10b192fe70e237c83bc752e2cbf66ffe0e':
  Delete unsed mDnsLock.
 2015-06-03 08:07:57 +00:00
Erik Kline
6a5c0e10b1 Delete unsed mDnsLock. 
Bug: 21449922
Change-Id: I0c9f95c30eaa170d809e86f6505379f34a0a7603
 2015-06-03 16:10:08 +09:00
Yoshiki Iguchi
54da4c981b am 0d8513ad: Merge "Add a permission annotation to IMM#setCurrentInputMethodSubtype." into mnc-dev 
* commit '0d8513adcacbbbc88b5228ad6fca12a38c721fce':
  Add a permission annotation to IMM#setCurrentInputMethodSubtype.
 2015-06-03 06:16:32 +00:00
Lorenzo Colitti
d315f373d8 am 0326f777: Merge changes I9b96cdcf,Ib4b29a7f into mnc-dev 
* commit '0326f7772cad003b1bc6b3d7c39429bf53333eb8':
  Remove the IPv4 address from the interface when DHCP fails.
  Make the dumpsys connectivity shorter and easier to read.
 2015-06-03 06:16:28 +00: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
Jan Nordqvist
92515f0a7b am 23cbc9d1: am d4928835: Cleaned out "isValid" from WifiConfig. 
* commit '23cbc9d1a7e25740573a4bb143ea8c8ec7d209e6':
  Cleaned out "isValid" from WifiConfig.
 2015-06-03 05:38:45 +00:00
Soonil Nagarkar
e61193b7b3 am a07d0a88: am 597492c9: Add NO_BATCH flag to WifiScanner 
* commit 'a07d0a88436595edcb9e33ebbd2faadb0e09de6e':
  Add NO_BATCH flag to WifiScanner
 2015-06-03 05:38:41 +00:00
Vinit Deshpande
9337bf0b7d am 18611fbf: am f0742bdf: Merge changes from topic \'mwd-merge-wifi-0602015\' into mnc-dev 
* commit '18611fbff8a72a32b171ac537efa639162869dd9':
  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:38:36 +00:00
Shawn Willden
b183fdca61 am 56396c7f: Merge "Track changes to the keystore binder API" into mnc-dev 
* commit '56396c7f5b54d165b46969ea3152abbb23cf792f':
  Track changes to the keystore binder API
 2015-06-03 05:38:25 +00:00
Shawn Willden
56396c7f5b Merge "Track changes to the keystore binder API" into mnc-dev 2015-06-03 05:22:02 +00:00
Seigo Nonaka
12eaf366f9 am 031aead1: am 2752a149: Merge "Use final in favor of initialization safety." into mnc-dev 
* commit '031aead10a77d0a0ffed9ede8d3edef87f28122f':
  Use final in favor of initialization safety.
 2015-06-03 05:21:26 +00:00
Jan Nordqvist
23cbc9d1a7 am d4928835: Cleaned out "isValid" from WifiConfig. 
* commit 'd49288352908e8cbc9a001e13df2eb35e78deb1a':
  Cleaned out "isValid" from WifiConfig.
 2015-06-03 05:21:12 +00:00
Soonil Nagarkar
a07d0a8843 am 597492c9: Add NO_BATCH flag to WifiScanner 
* commit '597492c963725366b320678786d241e7f654e347':
  Add NO_BATCH flag to WifiScanner
 2015-06-03 05:21:07 +00:00
Vinit Deshpande
18611fbff8 am f0742bdf: Merge changes from topic \'mwd-merge-wifi-0602015\' into mnc-dev 
* commit 'f0742bdf0665810cc64d22c0c275bc8c8b7463f0':
  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:21:02 +00:00
Jan Nordqvist
d492883529 Cleaned out "isValid" from WifiConfig. 
Change-Id: I028615e55700aa92889670297f1130397eba650f
(cherry picked from commit c50315e014)
 2015-06-03 05:18:12 +00:00
Soonil Nagarkar
597492c963 Add NO_BATCH flag to WifiScanner 
Change-Id: Idd521f724684986ff84306327d42b810f7b30245
(cherry picked from commit b9e6d98c6c)
 2015-06-03 05:17:57 +00:00
Seigo Nonaka
031aead10a am 2752a149: Merge "Use final in favor of initialization safety." into mnc-dev 
* commit '2752a14939d113e3f2696458b0b969bc023dadfa':
  Use final in favor of initialization safety.
 2015-06-03 05:10:09 +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
8b8af64d84 am 80233cda: am 2328423d: Add support for MITM for BluetoothSockets (1/4) 
* commit '80233cdabb31800fbe2d9d64eb2033fe5ab7e5e6':
  Add support for MITM for BluetoothSockets (1/4)
 2015-06-03 04:10:20 +00:00
Casper Bonde
80233cdabb am 2328423d: Add support for MITM for BluetoothSockets (1/4) 
* commit '2328423d19416da0c1068883c33e612d5729fc47':
  Add support for MITM for BluetoothSockets (1/4)
 2015-06-03 03:59:20 +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
4d51105164 am 43a2c8ff: am b12c9704: Merge "Send neighbors into NUD_PROBE rather than NUD_DELAY" into mnc-dev 
* commit '43a2c8ff4251039810c09fa5d52bfe40834f265b':
  Send neighbors into NUD_PROBE rather than NUD_DELAY
 2015-06-03 02:23:12 +00:00
Adrian Roos
547d9155da am b8ac541d: am 21d2a257: Prevent panel and QS expansion before device is decrypted 
* commit 'b8ac541d1fcf431ff13210af96938b20e3e494ff':
  Prevent panel and QS expansion before device is decrypted
 2015-06-03 02:23:05 +00:00
Svetoslav
f766363a36 am 1df1f713: am f559546d: Merge "Add annotations to a new API" into mnc-dev 
* commit '1df1f7137edb8ffa342a2cb4384e583290ee7b24':
  Add annotations to a new API
 2015-06-03 02:22:58 +00:00
Andres Morales
595bc35d70 am a2a73650: am 8f589d01: Merge "[LockSettings] migrate patterns to be indexed at \'1\'" into mnc-dev 
* commit 'a2a736500cfe12de2c9efbcb5b14854ab7183b82':
  [LockSettings] migrate patterns to be indexed at '1'
 2015-06-03 02:22:53 +00:00
Jun Mukai
c891bfbb11 am 7f0ad420: am 3c134877: Merge "Retire PFLAG_ONLY_DRAWS_BACKGROUND." into mnc-dev 
* commit '7f0ad420f435da9b57c2911d61803b52adeca528':
  Retire PFLAG_ONLY_DRAWS_BACKGROUND.
 2015-06-03 02:22:47 +00:00
Roozbeh Pournader
241ba8684f am 085b657d: am c021632e: Merge "Load hyphenation data for more languages." into mnc-dev 
* commit '085b657d856e87d884b5d80a7c0d83b735e48c1b':
  Load hyphenation data for more languages.
 2015-06-03 02:22:42 +00:00
Chris Craik
4119f89604 am c210c090: am 38f4396e: Merge "Handle shader matrix correctly when ignoring canvas transform" into mnc-dev 
* commit 'c210c090c591bdecd53ab2858964d5bf1922a213':
  Handle shader matrix correctly when ignoring canvas transform
 2015-06-03 02:22:33 +00:00
Casper Bonde
04b892809b am 0cc23891: am da177bb5: SAP: Change to use new SDP Api (4/4) 
* commit '0cc2389180db98b93fa24767430d385766ae1378':
  SAP: Change to use new SDP Api (4/4)
 2015-06-03 02:22:25 +00:00
Geoff Mendal
c539a33df0 am ecafdb05: (-s ours) am a0d30be3: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit 'ecafdb05b65116b0ecad2eaa3372874df893599a':
  Import translations. DO NOT MERGE
 2015-06-03 02:22:19 +00:00
Alan Viverette
14d8afc62f am 4156c870: am e25f6587: Merge "API review feedback for ThemedSpinnerAdapter, Spinner" into mnc-dev 
* commit '4156c8709bc46d48fb2a92ca580100308f68210d':
  API review feedback for ThemedSpinnerAdapter, Spinner
 2015-06-03 02:22:09 +00:00
John Reck
d3ae033161 am 513fe748: am 60582519: Merge "More colors, now with material colors" into mnc-dev 
* commit '513fe7489e4ac377a873a9c669dc40e9e01926b8':
  More colors, now with material colors
 2015-06-03 02:21:55 +00:00
John Reck
e36bd755cf am a4828d99: am 4e14da56: Merge "FrameInfo header fixes" into mnc-dev 
* commit 'a4828d999a9241c26c4f007308ed5cd383418fe9':
  FrameInfo header fixes
 2015-06-03 02:21:50 +00:00
Jonathan Basseri
b3aebbbee6 am ec756014: am 97769b0c: Merge "Migrating MmsConfig to CarrierConfigManager." into mnc-dev 
* commit 'ec75601467278f909656c66dbd7f137949628438':
  Migrating MmsConfig to CarrierConfigManager.
 2015-06-03 02:21:45 +00:00